diff --git a/public/components/ContentPanel/ContentPanel.tsx b/public/components/ContentPanel/ContentPanel.tsx
index a6660e2b..2f6acc7c 100644
--- a/public/components/ContentPanel/ContentPanel.tsx
+++ b/public/components/ContentPanel/ContentPanel.tsx
@@ -8,13 +8,13 @@ import {
   EuiFlexItem,
   EuiHorizontalRule,
   EuiPanel,
-  EuiTitle,
+  EuiText,
 } from '@elastic/eui';
 import React from 'react';
 
 interface ContentPanelProps {
   title?: string;
-  titleSize?: 'xxxs' | 'xxs' | 'xs' | 's' | 'm' | 'l';
+  titleSize?: 'xs' | 's' | 'm';
   total?: number;
   bodyStyles?: object;
   panelStyles?: object;
@@ -25,7 +25,7 @@ interface ContentPanelProps {
 
 const ContentPanel: React.SFC<ContentPanelProps> = ({
   title = '',
-  titleSize = 'l',
+  titleSize = 's',
   total = undefined,
   bodyStyles = {},
   panelStyles = {},
@@ -40,16 +40,16 @@ const ContentPanel: React.SFC<ContentPanelProps> = ({
       alignItems="center"
     >
       <EuiFlexItem>
-        <EuiTitle size={titleSize}>
-          <h3>
+        <EuiText size={titleSize}>
+          <h2>
             {title}
             {total !== undefined ? (
               <span
                 style={{ color: '#9f9f9f', fontWeight: 300 }}
               >{` (${total})`}</span>
             ) : null}
-          </h3>
-        </EuiTitle>
+          </h2>
+        </EuiText>
       </EuiFlexItem>
       {actions ? (
         <EuiFlexItem grow={false}>
diff --git a/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap b/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap
index 4a277201..13d35e14 100644
--- a/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap
+++ b/public/components/__tests__/__snapshots__/ContentPanel.test.tsx.snap
@@ -11,11 +11,13 @@ exports[`<ContentPanel /> spec renders the component 1`] = `
     <div
       class="euiFlexItem"
     >
-      <h3
-        class="euiTitle euiTitle--large"
+      <div
+        class="euiText euiText--small"
       >
-        Testing
-      </h3>
+        <h2>
+          Testing
+        </h2>
+      </div>
     </div>
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -57,11 +59,13 @@ exports[`<ContentPanel /> spec renders with empty actions 1`] = `
     <div
       class="euiFlexItem"
     >
-      <h3
-        class="euiTitle euiTitle--large"
+      <div
+        class="euiText euiText--small"
       >
-        Testing
-      </h3>
+        <h2>
+          Testing
+        </h2>
+      </div>
     </div>
   </div>
   <hr
diff --git a/public/pages/Channels/Channels.tsx b/public/pages/Channels/Channels.tsx
index 7d3bea3b..6e28b2fd 100644
--- a/public/pages/Channels/Channels.tsx
+++ b/public/pages/Channels/Channels.tsx
@@ -14,6 +14,7 @@ import {
   EuiTableSortingType,
   EuiTitle,
   SortDirection,
+  EuiText,
 } from '@elastic/eui';
 import { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
 import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
@@ -257,8 +258,8 @@ export class Channels extends MDSEnabledComponent<ChannelsProps, ChannelsState>
       isSelectable={true}
       selection={selection}
       noItemsMessage={<EuiEmptyPrompt
-        title={<h2>No channels to display</h2>}
-        body="To send or receive notifications, you will need to create a notification channel."
+        title={<EuiText size="s"><h2>No channels to display</h2></EuiText>}
+        body={<EuiText size="s">"To send or receive notifications, you will need to create a notification channel."</EuiText>}
         actions={<EuiSmallButton href={`#${ROUTES.CREATE_CHANNEL}`}>
           Create channel
         </EuiSmallButton>} />}
@@ -309,7 +310,7 @@ export class Channels extends MDSEnabledComponent<ChannelsProps, ChannelsState>
           }
           bodyStyles={{ padding: 'initial' }}
           title="Channels"
-          titleSize="m"
+          titleSize="s"
           total={this.state.total}
         >
           {channelControlsComponent}
@@ -318,7 +319,7 @@ export class Channels extends MDSEnabledComponent<ChannelsProps, ChannelsState>
         </ContentPanel>
       )}
     </>
-    
+
     );
   }
 };
diff --git a/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap
index f62687c9..b03d0e62 100644
--- a/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap
+++ b/public/pages/Channels/__tests__/__snapshots__/ChannelDetails.test.tsx.snap
@@ -15,11 +15,13 @@ exports[`<ChannelDetails/> spec handles a non-existing channel 1`] = `
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
-          <h1
-            class="euiTitle euiTitle--large"
+          <div
+            class="euiText euiText--small"
           >
-            -
-          </h1>
+            <h1>
+              -
+            </h1>
+          </div>
         </div>
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -55,11 +57,13 @@ exports[`<ChannelDetails/> spec handles a non-existing channel 1`] = `
       <div
         class="euiFlexItem"
       >
-        <h3
-          class="euiTitle euiTitle--small"
+        <div
+          class="euiText euiText--small"
         >
-          Name and description
-        </h3>
+          <h2>
+            Name and description
+          </h2>
+        </div>
       </div>
     </div>
     <hr
@@ -153,11 +157,13 @@ exports[`<ChannelDetails/> spec handles a non-existing channel 1`] = `
       <div
         class="euiFlexItem"
       >
-        <h3
-          class="euiTitle euiTitle--small"
+        <div
+          class="euiText euiText--small"
         >
-          Configurations
-        </h3>
+          <h2>
+            Configurations
+          </h2>
+        </div>
       </div>
     </div>
     <hr
@@ -185,11 +191,13 @@ exports[`<ChannelDetails/> spec renders a specific channel 1`] = `
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
-          <h1
-            class="euiTitle euiTitle--large"
+          <div
+            class="euiText euiText--small"
           >
-            -
-          </h1>
+            <h1>
+              -
+            </h1>
+          </div>
         </div>
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -225,11 +233,13 @@ exports[`<ChannelDetails/> spec renders a specific channel 1`] = `
       <div
         class="euiFlexItem"
       >
-        <h3
-          class="euiTitle euiTitle--small"
+        <div
+          class="euiText euiText--small"
         >
-          Name and description
-        </h3>
+          <h2>
+            Name and description
+          </h2>
+        </div>
       </div>
     </div>
     <hr
@@ -323,11 +333,13 @@ exports[`<ChannelDetails/> spec renders a specific channel 1`] = `
       <div
         class="euiFlexItem"
       >
-        <h3
-          class="euiTitle euiTitle--small"
+        <div
+          class="euiText euiText--small"
         >
-          Configurations
-        </h3>
+          <h2>
+            Configurations
+          </h2>
+        </div>
       </div>
     </div>
     <hr
@@ -354,11 +366,13 @@ exports[`<ChannelDetails/> spec renders the component 1`] = `
       <div
         class="euiFlexItem euiFlexItem--flexGrowZero"
       >
-        <h1
-          class="euiTitle euiTitle--large"
+        <div
+          class="euiText euiText--small"
         >
-          -
-        </h1>
+          <h1>
+            -
+          </h1>
+        </div>
       </div>
       <div
         class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap
index 70e53c08..77e8c13b 100644
--- a/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap
+++ b/public/pages/Channels/__tests__/__snapshots__/Channels.test.tsx.snap
@@ -11,16 +11,18 @@ exports[`<Channels/> spec renders the empty component 1`] = `
     <div
       class="euiFlexItem"
     >
-      <h3
-        class="euiTitle euiTitle--medium"
+      <div
+        class="euiText euiText--small"
       >
-        Channels
-        <span
-          style="color: rgb(159, 159, 159); font-weight: 300;"
-        >
-           (0)
-        </span>
-      </h3>
+        <h2>
+          Channels
+          <span
+            style="color: rgb(159, 159, 159); font-weight: 300;"
+          >
+             (0)
+          </span>
+        </h2>
+      </div>
     </div>
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -490,11 +492,13 @@ exports[`<Channels/> spec renders the empty component 1`] = `
                     <div
                       class="euiEmptyPrompt"
                     >
-                      <h2
-                        class="euiTitle euiTitle--medium"
+                      <div
+                        class="euiText euiText--small euiTitle euiTitle--medium"
                       >
-                        No channels to display
-                      </h2>
+                        <h2>
+                          No channels to display
+                        </h2>
+                      </div>
                       <span
                         class="euiTextColor euiTextColor--subdued"
                       >
@@ -504,7 +508,11 @@ exports[`<Channels/> spec renders the empty component 1`] = `
                         <div
                           class="euiText euiText--medium"
                         >
-                          To send or receive notifications, you will need to create a notification channel.
+                          <div
+                            class="euiText euiText--small"
+                          >
+                            "To send or receive notifications, you will need to create a notification channel."
+                          </div>
                         </div>
                       </span>
                       <div
diff --git a/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap
index 2eafcd44..eae92f86 100644
--- a/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap
+++ b/public/pages/Channels/__tests__/__snapshots__/DetailsListModal.test.tsx.snap
@@ -82,7 +82,13 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
                         <div
                           class="euiModalHeader__title"
                         >
-                          test header
+                          <div
+                            class="euiText euiText--small"
+                          >
+                            <h2>
+                              test header
+                            </h2>
+                          </div>
                         </div>
                       </div>
                       <div
@@ -313,7 +319,13 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
                                 <div
                                   class="euiModalHeader__title"
                                 >
-                                  test header
+                                  <div
+                                    class="euiText euiText--small"
+                                  >
+                                    <h2>
+                                      test header
+                                    </h2>
+                                  </div>
                                 </div>
                               </div>
                               <div
@@ -476,7 +488,13 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
                                   <div
                                     class="euiModalHeader__title"
                                   >
-                                    test header
+                                    <div
+                                      class="euiText euiText--small"
+                                    >
+                                      <h2>
+                                        test header
+                                      </h2>
+                                    </div>
                                   </div>
                                 </div>
                                 <div
@@ -639,7 +657,13 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
                                     <div
                                       class="euiModalHeader__title"
                                     >
-                                      test header
+                                      <div
+                                        class="euiText euiText--small"
+                                      >
+                                        <h2>
+                                          test header
+                                        </h2>
+                                      </div>
                                     </div>
                                   </div>
                                   <div
@@ -790,7 +814,13 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
                                       <div
                                         class="euiModalHeader__title"
                                       >
-                                        test header
+                                        <div
+                                          class="euiText euiText--small"
+                                        >
+                                          <h2>
+                                            test header
+                                          </h2>
+                                        </div>
                                       </div>
                                     </div>
                                     <div
@@ -995,7 +1025,17 @@ exports[`<DetailsListModal /> spec renders the component 1`] = `
                                   <div
                                     className="euiModalHeader__title"
                                   >
-                                    test header
+                                    <EuiText
+                                      size="s"
+                                    >
+                                      <div
+                                        className="euiText euiText--small"
+                                      >
+                                        <h2>
+                                          test header
+                                        </h2>
+                                      </div>
+                                    </EuiText>
                                   </div>
                                 </EuiModalHeaderTitle>
                               </div>
diff --git a/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap b/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap
index 1df1f38b..5ff99ef8 100644
--- a/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap
+++ b/public/pages/Channels/__tests__/__snapshots__/DetailsTableModal.test.tsx.snap
@@ -82,7 +82,13 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
                         <div
                           class="euiModalHeader__title"
                         >
-                          test header
+                          <div
+                            class="euiText euiText--small"
+                          >
+                            <h2>
+                              test header
+                            </h2>
+                          </div>
                         </div>
                       </div>
                       <div
@@ -377,7 +383,13 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
                                 <div
                                   class="euiModalHeader__title"
                                 >
-                                  test header
+                                  <div
+                                    class="euiText euiText--small"
+                                  >
+                                    <h2>
+                                      test header
+                                    </h2>
+                                  </div>
                                 </div>
                               </div>
                               <div
@@ -604,7 +616,13 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
                                   <div
                                     class="euiModalHeader__title"
                                   >
-                                    test header
+                                    <div
+                                      class="euiText euiText--small"
+                                    >
+                                      <h2>
+                                        test header
+                                      </h2>
+                                    </div>
                                   </div>
                                 </div>
                                 <div
@@ -831,7 +849,13 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
                                     <div
                                       class="euiModalHeader__title"
                                     >
-                                      test header
+                                      <div
+                                        class="euiText euiText--small"
+                                      >
+                                        <h2>
+                                          test header
+                                        </h2>
+                                      </div>
                                     </div>
                                   </div>
                                   <div
@@ -1046,7 +1070,13 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
                                       <div
                                         class="euiModalHeader__title"
                                       >
-                                        test header
+                                        <div
+                                          class="euiText euiText--small"
+                                        >
+                                          <h2>
+                                            test header
+                                          </h2>
+                                        </div>
                                       </div>
                                     </div>
                                     <div
@@ -1315,7 +1345,17 @@ exports[`<DetailsTableModal /> spec renders headers 1`] = `
                                   <div
                                     className="euiModalHeader__title"
                                   >
-                                    test header
+                                    <EuiText
+                                      size="s"
+                                    >
+                                      <div
+                                        className="euiText euiText--small"
+                                      >
+                                        <h2>
+                                          test header
+                                        </h2>
+                                      </div>
+                                    </EuiText>
                                   </div>
                                 </EuiModalHeaderTitle>
                               </div>
@@ -1935,7 +1975,13 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
                         <div
                           class="euiModalHeader__title"
                         >
-                          test header
+                          <div
+                            class="euiText euiText--small"
+                          >
+                            <h2>
+                              test header
+                            </h2>
+                          </div>
                         </div>
                       </div>
                       <div
@@ -2230,7 +2276,13 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
                                 <div
                                   class="euiModalHeader__title"
                                 >
-                                  test header
+                                  <div
+                                    class="euiText euiText--small"
+                                  >
+                                    <h2>
+                                      test header
+                                    </h2>
+                                  </div>
                                 </div>
                               </div>
                               <div
@@ -2457,7 +2509,13 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
                                   <div
                                     class="euiModalHeader__title"
                                   >
-                                    test header
+                                    <div
+                                      class="euiText euiText--small"
+                                    >
+                                      <h2>
+                                        test header
+                                      </h2>
+                                    </div>
                                   </div>
                                 </div>
                                 <div
@@ -2684,7 +2742,13 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
                                     <div
                                       class="euiModalHeader__title"
                                     >
-                                      test header
+                                      <div
+                                        class="euiText euiText--small"
+                                      >
+                                        <h2>
+                                          test header
+                                        </h2>
+                                      </div>
                                     </div>
                                   </div>
                                   <div
@@ -2899,7 +2963,13 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
                                       <div
                                         class="euiModalHeader__title"
                                       >
-                                        test header
+                                        <div
+                                          class="euiText euiText--small"
+                                        >
+                                          <h2>
+                                            test header
+                                          </h2>
+                                        </div>
                                       </div>
                                     </div>
                                     <div
@@ -3168,7 +3238,17 @@ exports[`<DetailsTableModal /> spec renders parameters 1`] = `
                                   <div
                                     className="euiModalHeader__title"
                                   >
-                                    test header
+                                    <EuiText
+                                      size="s"
+                                    >
+                                      <div
+                                        className="euiText euiText--small"
+                                      >
+                                        <h2>
+                                          test header
+                                        </h2>
+                                      </div>
+                                    </EuiText>
                                   </div>
                                 </EuiModalHeaderTitle>
                               </div>
diff --git a/public/pages/Channels/components/ChannelActions.tsx b/public/pages/Channels/components/ChannelActions.tsx
index b809e537..62b49eb3 100644
--- a/public/pages/Channels/components/ChannelActions.tsx
+++ b/public/pages/Channels/components/ChannelActions.tsx
@@ -99,6 +99,7 @@ export function ChannelActions(props: ChannelActionsProps) {
             <EuiContextMenuItem
               key={params.label}
               disabled={params.disabled}
+              size="s"
               onClick={() => {
                 setIsPopoverOpen(false);
                 if (params.modal) {
diff --git a/public/pages/Channels/components/details/ChannelDetails.tsx b/public/pages/Channels/components/details/ChannelDetails.tsx
index 96b71f4f..26a98565 100644
--- a/public/pages/Channels/components/details/ChannelDetails.tsx
+++ b/public/pages/Channels/components/details/ChannelDetails.tsx
@@ -11,7 +11,6 @@ import {
   EuiSmallButton,
   EuiSpacer,
   EuiText,
-  EuiTitle,
 } from '@elastic/eui';
 import { Toast } from '@elastic/eui/src/components/toast/global_toast_list';
 import React, { useContext, useEffect, useState } from 'react';
@@ -237,9 +236,9 @@ export function ChannelDetails(props: ChannelDetailsProps) {
           <EuiFlexItem grow={false}>
             <EuiFlexGroup gutterSize="m" alignItems="flexEnd">
               <EuiFlexItem grow={false}>
-                <EuiTitle size="l">
+                <EuiText size="s">
                   <h1>{channel?.name ?? '-'}</h1>
-                </EuiTitle>
+                </EuiText>
               </EuiFlexItem>
               {badgeComponent}
             </EuiFlexGroup>
diff --git a/public/pages/Channels/components/details/ChannelDetailsActions.tsx b/public/pages/Channels/components/details/ChannelDetailsActions.tsx
index 7d01d3df..e01b1716 100644
--- a/public/pages/Channels/components/details/ChannelDetailsActions.tsx
+++ b/public/pages/Channels/components/details/ChannelDetailsActions.tsx
@@ -101,6 +101,7 @@ export function ChannelDetailsActions(props: ChannelDetailsActionsProps) {
             <EuiContextMenuItem
               key={params.label}
               disabled={params.disabled}
+              size="s"
               onClick={() => {
                 setIsPopoverOpen(false);
                 if (params.modal) {
diff --git a/public/pages/Channels/components/modals/DeleteChannelModal.tsx b/public/pages/Channels/components/modals/DeleteChannelModal.tsx
index 636ed1f4..1002077c 100644
--- a/public/pages/Channels/components/modals/DeleteChannelModal.tsx
+++ b/public/pages/Channels/components/modals/DeleteChannelModal.tsx
@@ -48,10 +48,14 @@ export const DeleteChannelModal = (props: DeleteChannelModalProps) => {
     <EuiOverlayMask>
       <EuiModal onClose={props.onClose} maxWidth={500}>
         <EuiModalHeader>
-          <EuiModalHeaderTitle>{`Delete ${name}?`}</EuiModalHeaderTitle>
+          <EuiModalHeaderTitle>
+            <EuiText size="s">
+              <h2>{`Delete ${name}?`}</h2>
+            </EuiText>
+          </EuiModalHeaderTitle>
         </EuiModalHeader>
         <EuiModalBody>
-          <EuiText>{message}</EuiText>
+          <EuiText size="s">{message}</EuiText>
           {num >= 2 && (
             <>
               <EuiSpacer />
@@ -59,6 +63,7 @@ export const DeleteChannelModal = (props: DeleteChannelModalProps) => {
                 <EuiText
                   key={`channel-list-item-${i}`}
                   style={{ marginLeft: 20 }}
+                  size="s"
                 >
                   <li>{channel.name}</li>
                 </EuiText>
@@ -66,7 +71,7 @@ export const DeleteChannelModal = (props: DeleteChannelModalProps) => {
             </>
           )}
           <EuiSpacer />
-          <EuiText>
+          <EuiText size="s">
             To confirm delete, type <i>delete</i> in the field.
           </EuiText>
           <EuiCompressedFieldText
diff --git a/public/pages/Channels/components/modals/DetailsListModal.tsx b/public/pages/Channels/components/modals/DetailsListModal.tsx
index 9a84ca0f..cf8da981 100644
--- a/public/pages/Channels/components/modals/DetailsListModal.tsx
+++ b/public/pages/Channels/components/modals/DetailsListModal.tsx
@@ -13,6 +13,7 @@ import {
   EuiModalHeaderTitle,
   EuiOverlayMask,
   EuiTitle,
+  EuiText,
 } from '@elastic/eui';
 import React from 'react';
 import { ModalRootProps } from '../../../../components/Modal/ModalRoot';
@@ -30,7 +31,11 @@ export function DetailsListModal(props: DetailsListModalProps) {
       <EuiOverlayMask>
         <EuiModal onClose={props.onClose} maxWidth={800}>
           <EuiModalHeader>
-            <EuiModalHeaderTitle>{props.header}</EuiModalHeaderTitle>
+            <EuiModalHeaderTitle>
+              <EuiText size="s">
+                <h2>{props.header}</h2>
+              </EuiText>
+            </EuiModalHeaderTitle>
           </EuiModalHeader>
           <EuiModalBody>
             <EuiTitle size="xxs">
diff --git a/public/pages/Channels/components/modals/DetailsTableModal.tsx b/public/pages/Channels/components/modals/DetailsTableModal.tsx
index 773fe1f3..462b4ebc 100644
--- a/public/pages/Channels/components/modals/DetailsTableModal.tsx
+++ b/public/pages/Channels/components/modals/DetailsTableModal.tsx
@@ -13,6 +13,7 @@ import {
   EuiModalHeaderTitle,
   EuiOverlayMask,
   EuiTableFieldDataColumnType,
+  EuiText,
 } from '@elastic/eui';
 import React from 'react';
 import { ModalRootProps } from '../../../../components/Modal/ModalRoot';
@@ -49,7 +50,11 @@ export function DetailsTableModal(props: DetailsTableModalProps) {
       <EuiOverlayMask>
         <EuiModal onClose={props.onClose} maxWidth={800}>
           <EuiModalHeader>
-            <EuiModalHeaderTitle>{props.header}</EuiModalHeaderTitle>
+            <EuiModalHeaderTitle>
+              <EuiText size="s">
+                <h2>{props.header}</h2>
+              </EuiText>
+            </EuiModalHeaderTitle>
           </EuiModalHeader>
           <EuiModalBody>
             <EuiInMemoryTable items={props.items} columns={columns} />
diff --git a/public/pages/Channels/components/modals/MuteChannelModal.tsx b/public/pages/Channels/components/modals/MuteChannelModal.tsx
index b1b807f6..1634f632 100644
--- a/public/pages/Channels/components/modals/MuteChannelModal.tsx
+++ b/public/pages/Channels/components/modals/MuteChannelModal.tsx
@@ -37,10 +37,14 @@ export const MuteChannelModal = (props: MuteChannelModalProps) => {
     <EuiOverlayMask>
       <EuiModal onClose={props.onClose} maxWidth={500}>
         <EuiModalHeader>
-          <EuiModalHeaderTitle>{`Mute ${props.selected[0].name}?`}</EuiModalHeaderTitle>
+          <EuiModalHeaderTitle>
+            <EuiText size="s">
+              <h2>{`Mute ${props.selected[0].name}?`}</h2>
+            </EuiText>
+          </EuiModalHeaderTitle>
         </EuiModalHeader>
         <EuiModalBody>
-          <EuiText>
+          <EuiText size="s">
             This channel will stop sending notifications to its recipients.
             However, the channel will remain available for selection.
           </EuiText>
diff --git a/public/pages/CreateChannel/CreateChannel.tsx b/public/pages/CreateChannel/CreateChannel.tsx
index 2256cb59..99a76153 100644
--- a/public/pages/CreateChannel/CreateChannel.tsx
+++ b/public/pages/CreateChannel/CreateChannel.tsx
@@ -14,7 +14,6 @@ import {
   EuiCompressedSuperSelect,
   EuiSuperSelectOption,
   EuiText,
-  EuiTitle,
 } from '@elastic/eui';
 import queryString from 'query-string';
 import React, { createContext, useContext, useEffect, useState } from 'react';
@@ -365,9 +364,9 @@ export function CreateChannel(props: CreateChannelsProps) {
         value={{ edit: props.edit, inputErrors, setInputErrors }}
       >
        {!getUseUpdatedUx() && (
-          <EuiTitle size="l">
+          <EuiText size="s">
             <h1>{`${props.edit ? 'Edit' : 'Create'} channel`}</h1>
-          </EuiTitle>
+          </EuiText>
         )}
 
         <EuiSpacer />
diff --git a/public/pages/CreateChannel/__tests__/__snapshots__/ChannelNamePanel.test.tsx.snap b/public/pages/CreateChannel/__tests__/__snapshots__/ChannelNamePanel.test.tsx.snap
index 0e4b7f41..303884b0 100644
--- a/public/pages/CreateChannel/__tests__/__snapshots__/ChannelNamePanel.test.tsx.snap
+++ b/public/pages/CreateChannel/__tests__/__snapshots__/ChannelNamePanel.test.tsx.snap
@@ -11,11 +11,13 @@ exports[`<ChannelNamePanel/> spec renders errors 1`] = `
     <div
       class="euiFlexItem"
     >
-      <h3
-        class="euiTitle euiTitle--small"
+      <div
+        class="euiText euiText--small"
       >
-        Name and description
-      </h3>
+        <h2>
+          Name and description
+        </h2>
+      </div>
     </div>
   </div>
   <hr
@@ -118,11 +120,13 @@ exports[`<ChannelNamePanel/> spec renders the component 1`] = `
     <div
       class="euiFlexItem"
     >
-      <h3
-        class="euiTitle euiTitle--small"
+      <div
+        class="euiText euiText--small"
       >
-        Name and description
-      </h3>
+        <h2>
+          Name and description
+        </h2>
+      </div>
     </div>
   </div>
   <hr
diff --git a/public/pages/CreateChannel/__tests__/__snapshots__/CreateChannel.test.tsx.snap b/public/pages/CreateChannel/__tests__/__snapshots__/CreateChannel.test.tsx.snap
index c93e8141..af83701e 100644
--- a/public/pages/CreateChannel/__tests__/__snapshots__/CreateChannel.test.tsx.snap
+++ b/public/pages/CreateChannel/__tests__/__snapshots__/CreateChannel.test.tsx.snap
@@ -1,9 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<CreateChannel/> spec renders the component 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Create channel
-</h1>
+  <h1>
+    Create channel
+  </h1>
+</div>
 `;
diff --git a/public/pages/CreateChannel/components/modals/CreateRecipientGroupModal.tsx b/public/pages/CreateChannel/components/modals/CreateRecipientGroupModal.tsx
index 5d7225ec..e3610256 100644
--- a/public/pages/CreateChannel/components/modals/CreateRecipientGroupModal.tsx
+++ b/public/pages/CreateChannel/components/modals/CreateRecipientGroupModal.tsx
@@ -13,6 +13,7 @@ import {
   EuiModalHeader,
   EuiModalHeaderTitle,
   EuiOverlayMask,
+  EuiText,
 } from '@elastic/eui';
 import React, { useContext, useState } from 'react';
 import { CoreServicesContext } from '../../../../components/coreServices';
@@ -66,7 +67,11 @@ export function CreateRecipientGroupModal(
     <EuiOverlayMask>
       <EuiModal onClose={props.onClose} style={{ width: 650 }}>
         <EuiModalHeader>
-          <EuiModalHeaderTitle>Create recipient group</EuiModalHeaderTitle>
+          <EuiModalHeaderTitle>
+            <EuiText size="s">
+              <h2>Create recipient group</h2>
+            </EuiText>
+          </EuiModalHeaderTitle>
         </EuiModalHeader>
 
         <EuiModalBody>
diff --git a/public/pages/CreateChannel/components/modals/CreateSESSenderModal.tsx b/public/pages/CreateChannel/components/modals/CreateSESSenderModal.tsx
index a674111a..0ab58e6d 100644
--- a/public/pages/CreateChannel/components/modals/CreateSESSenderModal.tsx
+++ b/public/pages/CreateChannel/components/modals/CreateSESSenderModal.tsx
@@ -13,6 +13,7 @@ import {
   EuiModalHeader,
   EuiModalHeaderTitle,
   EuiOverlayMask,
+  EuiText,
 } from '@elastic/eui';
 import React, { useContext, useState } from 'react';
 import { CoreServicesContext } from '../../../../components/coreServices';
@@ -70,7 +71,11 @@ export function CreateSESSenderModal(props: CreateSESSenderModalProps) {
     <EuiOverlayMask>
       <EuiModal onClose={props.onClose} style={{ width: 750 }}>
         <EuiModalHeader>
-          <EuiModalHeaderTitle>Create SES sender</EuiModalHeaderTitle>
+          <EuiModalHeaderTitle>
+            <EuiText size="s">
+              <h2>Create SES sender</h2>
+            </EuiText>
+          </EuiModalHeaderTitle>
         </EuiModalHeader>
 
         <EuiModalBody>
diff --git a/public/pages/CreateChannel/components/modals/CreateSenderModal.tsx b/public/pages/CreateChannel/components/modals/CreateSenderModal.tsx
index 9fe19221..7801aa18 100644
--- a/public/pages/CreateChannel/components/modals/CreateSenderModal.tsx
+++ b/public/pages/CreateChannel/components/modals/CreateSenderModal.tsx
@@ -13,6 +13,7 @@ import {
   EuiModalHeader,
   EuiModalHeaderTitle,
   EuiOverlayMask,
+  EuiText,
 } from '@elastic/eui';
 import React, { useContext, useState } from 'react';
 import { CoreServicesContext } from '../../../../components/coreServices';
@@ -68,7 +69,11 @@ export function CreateSenderModal(props: CreateSenderModalProps) {
     <EuiOverlayMask>
       <EuiModal onClose={props.onClose} style={{ width: 750 }}>
         <EuiModalHeader>
-          <EuiModalHeaderTitle>Create SMTP sender</EuiModalHeaderTitle>
+          <EuiModalHeaderTitle>
+            <EuiText size="s">
+              <h2>Create SMTP sender</h2>
+            </EuiText>
+          </EuiModalHeaderTitle>
         </EuiModalHeader>
 
         <EuiModalBody>
diff --git a/public/pages/Emails/CreateRecipientGroup.tsx b/public/pages/Emails/CreateRecipientGroup.tsx
index 9ac9c534..1322c8e8 100644
--- a/public/pages/Emails/CreateRecipientGroup.tsx
+++ b/public/pages/Emails/CreateRecipientGroup.tsx
@@ -10,7 +10,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiSpacer,
-  EuiTitle,
+  EuiText,
 } from '@elastic/eui';
 import React, { useContext, useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
@@ -105,9 +105,9 @@ export function CreateRecipientGroup(props: CreateRecipientGroupProps) {
   return (
     <>
       {!getUseUpdatedUx() && (
-        <EuiTitle size="l">
+        <EuiText size="s">
           <h1>{`${props.edit ? 'Edit' : 'Create'} recipient group`}</h1>
-        </EuiTitle>
+        </EuiText>
       )}
 
       <EuiSpacer />
diff --git a/public/pages/Emails/CreateSESSender.tsx b/public/pages/Emails/CreateSESSender.tsx
index 63a6c960..8b9f84ad 100644
--- a/public/pages/Emails/CreateSESSender.tsx
+++ b/public/pages/Emails/CreateSESSender.tsx
@@ -9,7 +9,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiSpacer,
-  EuiTitle,
+  EuiText,
 } from '@elastic/eui';
 import React, { useContext, useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
@@ -102,9 +102,9 @@ export function CreateSESSender(props: CreateSESSenderProps) {
   return (
     <>
       {!getUseUpdatedUx() && (
-        <EuiTitle size="l">
+        <EuiText size="s">
           <h1>{`${props.edit ? 'Edit' : 'Create'} SES sender`}</h1>
-        </EuiTitle>
+        </EuiText>
       )}
 
       <EuiSpacer />
diff --git a/public/pages/Emails/CreateSender.tsx b/public/pages/Emails/CreateSender.tsx
index 15492bbd..31c5b282 100644
--- a/public/pages/Emails/CreateSender.tsx
+++ b/public/pages/Emails/CreateSender.tsx
@@ -9,7 +9,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiSpacer,
-  EuiTitle,
+  EuiText,
 } from '@elastic/eui';
 import React, { useContext, useEffect, useState } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
@@ -99,9 +99,9 @@ export function CreateSender(props: CreateSenderProps) {
   return (
     <>
       {!getUseUpdatedUx() && (
-        <EuiTitle size="l">
+        <EuiText size="s">
           <h1>{`${props.edit ? 'Edit' : 'Create'} SMTP sender`}</h1>
-        </EuiTitle>
+        </EuiText>
       )}
 
       <EuiSpacer />
diff --git a/public/pages/Emails/EmailGroups.tsx b/public/pages/Emails/EmailGroups.tsx
index 90a5cd2c..109e0808 100644
--- a/public/pages/Emails/EmailGroups.tsx
+++ b/public/pages/Emails/EmailGroups.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiSpacer, EuiTitle } from '@elastic/eui';
+import { EuiSpacer, EuiText } from '@elastic/eui';
 import React, { useContext, useEffect } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { CoreServicesContext } from '../../components/coreServices';
@@ -29,9 +29,9 @@ export function EmailGroups(props: EmailGroupsProps) {
   return (
     <>
       {!getUseUpdatedUx() && (
-        <EuiTitle size="l">
+        <EuiText size="s">
           <h1>Email recipient groups</h1>
-        </EuiTitle>
+        </EuiText>
       )}
 
       <EuiSpacer />
diff --git a/public/pages/Emails/EmailSenders.tsx b/public/pages/Emails/EmailSenders.tsx
index 1c50387a..05e7beb9 100644
--- a/public/pages/Emails/EmailSenders.tsx
+++ b/public/pages/Emails/EmailSenders.tsx
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { EuiSpacer, EuiTitle } from '@elastic/eui';
+import { EuiSpacer, EuiText } from '@elastic/eui';
 import React, { useContext, useEffect } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { CoreServicesContext } from '../../components/coreServices';
@@ -25,7 +25,7 @@ export function EmailSenders(props: EmailSendersProps) {
 
   // Call the hook to manage URL updates
   useUpdateUrlWithDataSourceProperties();
-  
+
   useEffect(() => {
     setBreadcrumbs([
       BREADCRUMBS.NOTIFICATIONS,
@@ -37,9 +37,9 @@ export function EmailSenders(props: EmailSendersProps) {
   return (
     <>
       {!getUseUpdatedUx() && (
-        <EuiTitle size="l">
+        <EuiText size="s">
           <h1>Email senders</h1>
-        </EuiTitle>
+        </EuiText>
       )}
       {mainStateContext.availableConfigTypes.includes('smtp_account') && (
         <>
diff --git a/public/pages/Emails/__tests__/__snapshots__/CreateRecipientGroup.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/CreateRecipientGroup.test.tsx.snap
index 3bd7021d..4009d0b8 100644
--- a/public/pages/Emails/__tests__/__snapshots__/CreateRecipientGroup.test.tsx.snap
+++ b/public/pages/Emails/__tests__/__snapshots__/CreateRecipientGroup.test.tsx.snap
@@ -1,9 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<CreateRecipientGroup/> spec renders the component 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Create recipient group
-</h1>
+  <h1>
+    Create recipient group
+  </h1>
+</div>
 `;
diff --git a/public/pages/Emails/__tests__/__snapshots__/CreateSESSender.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/CreateSESSender.test.tsx.snap
index 30e8145c..97b70161 100644
--- a/public/pages/Emails/__tests__/__snapshots__/CreateSESSender.test.tsx.snap
+++ b/public/pages/Emails/__tests__/__snapshots__/CreateSESSender.test.tsx.snap
@@ -1,25 +1,31 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<CreateSESSender/> spec handles failed requests 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Edit SES sender
-</h1>
+  <h1>
+    Edit SES sender
+  </h1>
+</div>
 `;
 
 exports[`<CreateSESSender/> spec renders the component 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Create SES sender
-</h1>
+  <h1>
+    Create SES sender
+  </h1>
+</div>
 `;
 
 exports[`<CreateSESSender/> spec renders the component for editing 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Edit SES sender
-</h1>
+  <h1>
+    Edit SES sender
+  </h1>
+</div>
 `;
diff --git a/public/pages/Emails/__tests__/__snapshots__/CreateSender.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/CreateSender.test.tsx.snap
index b6ff392a..68449f39 100644
--- a/public/pages/Emails/__tests__/__snapshots__/CreateSender.test.tsx.snap
+++ b/public/pages/Emails/__tests__/__snapshots__/CreateSender.test.tsx.snap
@@ -1,25 +1,31 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<CreateSender/> spec handles failed requests 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Edit SMTP sender
-</h1>
+  <h1>
+    Edit SMTP sender
+  </h1>
+</div>
 `;
 
 exports[`<CreateSender/> spec renders the component 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Create SMTP sender
-</h1>
+  <h1>
+    Create SMTP sender
+  </h1>
+</div>
 `;
 
 exports[`<CreateSender/> spec renders the component for editing 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Edit SMTP sender
-</h1>
+  <h1>
+    Edit SMTP sender
+  </h1>
+</div>
 `;
diff --git a/public/pages/Emails/__tests__/__snapshots__/EmailGroups.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/EmailGroups.test.tsx.snap
index ed8880f6..a4b40b5b 100644
--- a/public/pages/Emails/__tests__/__snapshots__/EmailGroups.test.tsx.snap
+++ b/public/pages/Emails/__tests__/__snapshots__/EmailGroups.test.tsx.snap
@@ -1,9 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<EmailGroups/> spec renders the component 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Email recipient groups
-</h1>
+  <h1>
+    Email recipient groups
+  </h1>
+</div>
 `;
diff --git a/public/pages/Emails/__tests__/__snapshots__/EmailSenders.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/EmailSenders.test.tsx.snap
index 1483fdaa..00e42cc1 100644
--- a/public/pages/Emails/__tests__/__snapshots__/EmailSenders.test.tsx.snap
+++ b/public/pages/Emails/__tests__/__snapshots__/EmailSenders.test.tsx.snap
@@ -1,17 +1,21 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`<EmailSenders/> spec renders the component with SMTP config type 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Email senders
-</h1>
+  <h1>
+    Email senders
+  </h1>
+</div>
 `;
 
 exports[`<EmailSenders/> spec renders the component without SMTP config type 1`] = `
-<h1
-  class="euiTitle euiTitle--large"
+<div
+  class="euiText euiText--small"
 >
-  Email senders
-</h1>
+  <h1>
+    Email senders
+  </h1>
+</div>
 `;
diff --git a/public/pages/Emails/__tests__/__snapshots__/RecipientGroupsTable.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/RecipientGroupsTable.test.tsx.snap
index ebb37281..fb2a223c 100644
--- a/public/pages/Emails/__tests__/__snapshots__/RecipientGroupsTable.test.tsx.snap
+++ b/public/pages/Emails/__tests__/__snapshots__/RecipientGroupsTable.test.tsx.snap
@@ -11,16 +11,18 @@ exports[`<RecipientGroupsTable /> spec renders empty state 1`] = `
     <div
       class="euiFlexItem"
     >
-      <h3
-        class="euiTitle euiTitle--medium"
+      <div
+        class="euiText euiText--small"
       >
-        Recipient groups
-        <span
-          style="color: rgb(159, 159, 159); font-weight: 300;"
-        >
-           (0)
-        </span>
-      </h3>
+        <h2>
+          Recipient groups
+          <span
+            style="color: rgb(159, 159, 159); font-weight: 300;"
+          >
+             (0)
+          </span>
+        </h2>
+      </div>
     </div>
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -368,11 +370,13 @@ exports[`<RecipientGroupsTable /> spec renders empty state 1`] = `
                     <div
                       class="euiEmptyPrompt"
                     >
-                      <h2
-                        class="euiTitle euiTitle--medium"
+                      <div
+                        class="euiText euiText--small euiTitle euiTitle--medium"
                       >
-                        No recipient groups to display
-                      </h2>
+                        <h2>
+                          No recipient groups to display
+                        </h2>
+                      </div>
                       <span
                         class="euiTextColor euiTextColor--subdued"
                       >
@@ -382,7 +386,11 @@ exports[`<RecipientGroupsTable /> spec renders empty state 1`] = `
                         <div
                           class="euiText euiText--medium"
                         >
-                          Use an email group to manage a list of email addresses you frequently send at a time. You can select recipient groups when configuring email channels.
+                          <div
+                            class="euiText euiText--small"
+                          >
+                            Use an email group to manage a list of email addresses you frequently send at a time. You can select recipient groups when configuring email channels.
+                          </div>
                         </div>
                       </span>
                       <div
diff --git a/public/pages/Emails/__tests__/__snapshots__/SendersTable.test.tsx.snap b/public/pages/Emails/__tests__/__snapshots__/SendersTable.test.tsx.snap
index 8a9c87cd..647c1655 100644
--- a/public/pages/Emails/__tests__/__snapshots__/SendersTable.test.tsx.snap
+++ b/public/pages/Emails/__tests__/__snapshots__/SendersTable.test.tsx.snap
@@ -11,16 +11,18 @@ exports[`<SendersTable /> spec renders empty state 1`] = `
     <div
       class="euiFlexItem"
     >
-      <h3
-        class="euiTitle euiTitle--medium"
+      <div
+        class="euiText euiText--small"
       >
-        SMTP senders
-        <span
-          style="color: rgb(159, 159, 159); font-weight: 300;"
-        >
-           (0)
-        </span>
-      </h3>
+        <h2>
+          SMTP senders
+          <span
+            style="color: rgb(159, 159, 159); font-weight: 300;"
+          >
+             (0)
+          </span>
+        </h2>
+      </div>
     </div>
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -470,11 +472,13 @@ exports[`<SendersTable /> spec renders empty state 1`] = `
                     <div
                       class="euiEmptyPrompt"
                     >
-                      <h2
-                        class="euiTitle euiTitle--medium"
+                      <div
+                        class="euiText euiText--small euiTitle euiTitle--medium"
                       >
-                        No SMTP senders to display
-                      </h2>
+                        <h2>
+                          No SMTP senders to display
+                        </h2>
+                      </div>
                       <span
                         class="euiTextColor euiTextColor--subdued"
                       >
@@ -484,7 +488,11 @@ exports[`<SendersTable /> spec renders empty state 1`] = `
                         <div
                           class="euiText euiText--medium"
                         >
-                          Set up an outbound email server by creating a sender. You will select a sender when configuring email channels.
+                          <div
+                            class="euiText euiText--small"
+                          >
+                            Set up an outbound email server by creating a sender. You will select a sender when configuring email channels.
+                          </div>
                         </div>
                       </span>
                       <div
diff --git a/public/pages/Emails/components/modals/DeleteRecipientGroupModal.tsx b/public/pages/Emails/components/modals/DeleteRecipientGroupModal.tsx
index 7066348c..ee178b4d 100644
--- a/public/pages/Emails/components/modals/DeleteRecipientGroupModal.tsx
+++ b/public/pages/Emails/components/modals/DeleteRecipientGroupModal.tsx
@@ -50,10 +50,14 @@ export const DeleteRecipientGroupModal = (
     <EuiOverlayMask>
       <EuiModal onClose={props.onClose} maxWidth={500}>
         <EuiModalHeader>
-          <EuiModalHeaderTitle>{`Delete ${name}?`}</EuiModalHeaderTitle>
+          <EuiModalHeaderTitle>
+            <EuiText size="s">
+              <h2>{`Delete ${name}?`}</h2>
+            </EuiText>
+          </EuiModalHeaderTitle>
         </EuiModalHeader>
         <EuiModalBody>
-          <EuiText>{message}</EuiText>
+          <EuiText size="s">{message}</EuiText>
           {num >= 2 && (
             <>
               <EuiSpacer />
@@ -68,7 +72,7 @@ export const DeleteRecipientGroupModal = (
             </>
           )}
           <EuiSpacer />
-          <EuiText>
+          <EuiText size="s">
             To confirm delete, type <i>delete</i> in the field.
           </EuiText>
           <EuiCompressedFieldText
diff --git a/public/pages/Emails/components/modals/DeleteSenderModal.tsx b/public/pages/Emails/components/modals/DeleteSenderModal.tsx
index be7f47a8..52667eed 100644
--- a/public/pages/Emails/components/modals/DeleteSenderModal.tsx
+++ b/public/pages/Emails/components/modals/DeleteSenderModal.tsx
@@ -47,10 +47,14 @@ export const DeleteSenderModal = (props: DeleteSenderModalProps) => {
     <EuiOverlayMask>
       <EuiModal onClose={props.onClose} maxWidth={500}>
         <EuiModalHeader>
-          <EuiModalHeaderTitle>{`Delete ${name}?`}</EuiModalHeaderTitle>
+          <EuiModalHeaderTitle>
+            <EuiText size="s">
+              <h2>{`Delete ${name}?`}</h2>
+            </EuiText>
+          </EuiModalHeaderTitle>
         </EuiModalHeader>
         <EuiModalBody>
-          <EuiText>{message}</EuiText>
+          <EuiText size="s">{message}</EuiText>
           {num >= 2 && (
             <>
               <EuiSpacer />
@@ -58,6 +62,7 @@ export const DeleteSenderModal = (props: DeleteSenderModalProps) => {
                 <EuiText
                   key={`sender-list-item-${i}`}
                   style={{ marginLeft: 20 }}
+                  size="s"
                 >
                   <li>{sender.name}</li>
                 </EuiText>
@@ -65,7 +70,7 @@ export const DeleteSenderModal = (props: DeleteSenderModalProps) => {
             </>
           )}
           <EuiSpacer />
-          <EuiText>
+          <EuiText size="s">
             To confirm delete, type <i>delete</i> in the field.
           </EuiText>
           <EuiCompressedFieldText
diff --git a/public/pages/Emails/components/tables/RecipientGroupsTable.tsx b/public/pages/Emails/components/tables/RecipientGroupsTable.tsx
index 9d2cb2b6..d7a1f27e 100644
--- a/public/pages/Emails/components/tables/RecipientGroupsTable.tsx
+++ b/public/pages/Emails/components/tables/RecipientGroupsTable.tsx
@@ -18,6 +18,7 @@ import {
   EuiTableSortingType,
   EuiTitle,
   SortDirection,
+  EuiText,
 } from '@elastic/eui';
 import { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
 import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
@@ -286,8 +287,12 @@ export class RecipientGroupsTable extends Component<
       isSelectable={true}
       selection={selection}
       noItemsMessage={<EuiEmptyPrompt
-        title={<h2>No recipient groups to display</h2>}
-        body="Use an email group to manage a list of email addresses you frequently send at a time. You can select recipient groups when configuring email channels."
+        title={<EuiText size="s"><h2>No recipient groups to display</h2></EuiText>}
+        body={
+          <EuiText size="s">
+            Use an email group to manage a list of email addresses you frequently send at a time. You can select recipient groups when configuring email channels.
+          </EuiText>
+        }
         actions={<EuiSmallButton href={`#${ROUTES.CREATE_RECIPIENT_GROUP}`}>
           Create recipient group
         </EuiSmallButton>} />}
@@ -330,6 +335,7 @@ export class RecipientGroupsTable extends Component<
                           <EuiContextMenuItem
                             key={action.label}
                             disabled={action.disabled}
+                            size="s"
                             onClick={() => {
                               this.setState({ isPopoverOpen: false });
                               if (action.modal) {
@@ -401,7 +407,7 @@ export class RecipientGroupsTable extends Component<
             }
             bodyStyles={{ padding: 'initial' }}
             title="Recipient groups"
-            titleSize="m"
+            titleSize="s"
             total={this.state.total}
           >
             {searchComponent}
diff --git a/public/pages/Emails/components/tables/SESSendersTable.tsx b/public/pages/Emails/components/tables/SESSendersTable.tsx
index aed3287b..2b5059b7 100644
--- a/public/pages/Emails/components/tables/SESSendersTable.tsx
+++ b/public/pages/Emails/components/tables/SESSendersTable.tsx
@@ -16,6 +16,7 @@ import {
   EuiTableFieldDataColumnType,
   EuiTableSortingType,
   SortDirection,
+  EuiText,
 } from '@elastic/eui';
 import { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
 import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
@@ -223,8 +224,8 @@ export class SESSendersTable extends Component<
       isSelectable={true}
       selection={selection}
       noItemsMessage={<EuiEmptyPrompt
-        title={<h2>No SES senders to display</h2>}
-        body="Set up an outbound email server by creating a sender. You will select a sender when configuring email channels."
+        title={<EuiText size="s"><h2>No SES senders to display</h2></EuiText>}
+        body={<EuiText size="s">Set up an outbound email server by creating a sender. You will select a sender when configuring email channels.</EuiText>}
         actions={<EuiSmallButton href={`#${ROUTES.CREATE_SES_SENDER}`}>
           Create SES sender
         </EuiSmallButton>} />}
@@ -259,7 +260,7 @@ export class SESSendersTable extends Component<
             }
             bodyStyles={{ padding: 'initial' }}
             title="SES senders"
-            titleSize="m"
+            titleSize="s"
             total={this.state.total}
           >
             <EuiFlexGroup>
@@ -288,6 +289,7 @@ export class SESSendersTable extends Component<
                         <EuiContextMenuItem
                           key={action.label}
                           disabled={action.disabled}
+                          size="s"
                           onClick={() => {
                             this.setState({ isPopoverOpen: false });
                             if (action.modal) {
@@ -360,7 +362,7 @@ export class SESSendersTable extends Component<
             }
             bodyStyles={{ padding: 'initial' }}
             title="SES senders"
-            titleSize="m"
+            titleSize="s"
             total={this.state.total}
           >
             {searchComponent}
diff --git a/public/pages/Emails/components/tables/SendersTable.tsx b/public/pages/Emails/components/tables/SendersTable.tsx
index efee0179..dba914f5 100644
--- a/public/pages/Emails/components/tables/SendersTable.tsx
+++ b/public/pages/Emails/components/tables/SendersTable.tsx
@@ -15,6 +15,7 @@ import {
   EuiTableFieldDataColumnType,
   EuiTableSortingType,
   SortDirection,
+  EuiText,
 } from '@elastic/eui';
 import { Criteria } from '@elastic/eui/src/components/basic_table/basic_table';
 import { Pagination } from '@elastic/eui/src/components/basic_table/pagination_bar';
@@ -250,8 +251,12 @@ export class SendersTable extends Component<
       isSelectable={true}
       selection={selection}
       noItemsMessage={<EuiEmptyPrompt
-        title={<h2>No SMTP senders to display</h2>}
-        body="Set up an outbound email server by creating a sender. You will select a sender when configuring email channels."
+        title={<EuiText size="s"><h2>No SMTP senders to display</h2></EuiText>}
+        body={
+          <EuiText size="s">
+            Set up an outbound email server by creating a sender. You will select a sender when configuring email channels.
+          </EuiText>
+        }
         actions={<EuiSmallButton href={`#${ROUTES.CREATE_SENDER}`}>
           Create SMTP sender
         </EuiSmallButton>} />}
@@ -279,7 +284,7 @@ export class SendersTable extends Component<
             }
             bodyStyles={{ padding: 'initial' }}
             title="SMTP senders"
-            titleSize="m"
+            titleSize="s"
             total={this.state.total}
           >
             <EuiFlexGroup>
@@ -308,6 +313,7 @@ export class SendersTable extends Component<
                         <EuiContextMenuItem
                           key={action.label}
                           disabled={action.disabled}
+                          size="s"
                           onClick={() => {
                             this.setState({ isPopoverOpen: false });
                             if (action.modal) {
@@ -380,7 +386,7 @@ export class SendersTable extends Component<
             }
             bodyStyles={{ padding: 'initial' }}
             title="SMTP senders"
-            titleSize="m"
+            titleSize="s"
             total={this.state.total}
           >
             {senderControlComponent}
diff --git a/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap b/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap
index 9f5714fe..49182f1a 100644
--- a/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap
+++ b/public/pages/Main/__tests__/__snapshots__/Main.test.tsx.snap
@@ -116,16 +116,18 @@ exports[`<Main /> spec renders the component 1`] = `
         <div
           class="euiFlexItem"
         >
-          <h3
-            class="euiTitle euiTitle--medium"
+          <div
+            class="euiText euiText--small"
           >
-            Channels
-            <span
-              style="color: rgb(159, 159, 159); font-weight: 300;"
-            >
-               (0)
-            </span>
-          </h3>
+            <h2>
+              Channels
+              <span
+                style="color: rgb(159, 159, 159); font-weight: 300;"
+              >
+                 (0)
+              </span>
+            </h2>
+          </div>
         </div>
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -595,11 +597,13 @@ exports[`<Main /> spec renders the component 1`] = `
                         <div
                           class="euiEmptyPrompt"
                         >
-                          <h2
-                            class="euiTitle euiTitle--medium"
+                          <div
+                            class="euiText euiText--small euiTitle euiTitle--medium"
                           >
-                            No channels to display
-                          </h2>
+                            <h2>
+                              No channels to display
+                            </h2>
+                          </div>
                           <span
                             class="euiTextColor euiTextColor--subdued"
                           >
@@ -609,7 +613,11 @@ exports[`<Main /> spec renders the component 1`] = `
                             <div
                               class="euiText euiText--medium"
                             >
-                              To send or receive notifications, you will need to create a notification channel.
+                              <div
+                                class="euiText euiText--small"
+                              >
+                                "To send or receive notifications, you will need to create a notification channel."
+                              </div>
                             </div>
                           </span>
                           <div