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