diff --git a/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap b/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap
index 96b1926d8..af89abf14 100644
--- a/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap
+++ b/public/components/ContentPanel/__snapshots__/ContentPanel.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`ContentPanel renders 1`] = `
 <div
-  class="euiPanel euiPanel--paddingMedium"
+  class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
   style="padding-left:0px;padding-right:0px"
 >
   <div
diff --git a/public/components/FormControls/FormikCheckableCard/__snapshots__/FormikCheckableCard.test.js.snap b/public/components/FormControls/FormikCheckableCard/__snapshots__/FormikCheckableCard.test.js.snap
index 0bda3fa43..303b528a6 100644
--- a/public/components/FormControls/FormikCheckableCard/__snapshots__/FormikCheckableCard.test.js.snap
+++ b/public/components/FormControls/FormikCheckableCard/__snapshots__/FormikCheckableCard.test.js.snap
@@ -2,27 +2,27 @@
 
 exports[`FormikCheckableCard render 1`] = `
 <div
-  class="euiCheckableCard"
+  class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
 >
   <div
-    class="euiCheckableCard__row"
+    class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
   >
     <div
-      class="euiCheckableCard__control"
+      class="euiRadio euiRadio--noLabel"
     >
+      <input
+        class="euiRadio__input"
+        name="testing"
+        type="radio"
+      />
       <div
-        class="euiRadio euiRadio--noLabel"
-      >
-        <input
-          class="euiRadio__input"
-          name="testing"
-          type="radio"
-        />
-        <div
-          class="euiRadio__circle"
-        />
-      </div>
+        class="euiRadio__circle"
+      />
     </div>
+  </div>
+  <div
+    class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+  >
     <label
       class="euiCheckableCard__label"
     />
@@ -39,27 +39,27 @@ exports[`FormikCheckableCard render formRow 1`] = `
     class="euiFormRow__fieldWrapper"
   >
     <div
-      class="euiCheckableCard"
+      class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
     >
       <div
-        class="euiCheckableCard__row"
+        class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
       >
         <div
-          class="euiCheckableCard__control"
+          class="euiRadio euiRadio--noLabel"
         >
+          <input
+            class="euiRadio__input"
+            name="testing"
+            type="radio"
+          />
           <div
-            class="euiRadio euiRadio--noLabel"
-          >
-            <input
-              class="euiRadio__input"
-              name="testing"
-              type="radio"
-            />
-            <div
-              class="euiRadio__circle"
-            />
-          </div>
+            class="euiRadio__circle"
+          />
         </div>
+      </div>
+      <div
+        class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+      >
         <label
           class="euiCheckableCard__label"
         />
diff --git a/public/components/FormControls/FormikCodeEditor/__snapshots__/FormikCodeEditor.test.js.snap b/public/components/FormControls/FormikCodeEditor/__snapshots__/FormikCodeEditor.test.js.snap
index c044cb2f4..9c737bd95 100644
--- a/public/components/FormControls/FormikCodeEditor/__snapshots__/FormikCodeEditor.test.js.snap
+++ b/public/components/FormControls/FormikCodeEditor/__snapshots__/FormikCodeEditor.test.js.snap
@@ -12,12 +12,10 @@ exports[`FormikCodeEditor render formRow 1`] = `
       class="euiCodeEditorWrapper"
       data-test-subj="codeEditorContainer"
     >
-      <div
+      <button
         class="euiCodeEditorKeyboardHint"
         data-test-subj="codeEditorHint"
         id="generated-id"
-        role="button"
-        tabindex="0"
       >
         <p
           class="euiText"
@@ -29,7 +27,7 @@ exports[`FormikCodeEditor render formRow 1`] = `
         >
           When you're done, press Escape to stop editing.
         </p>
-      </div>
+      </button>
       <div
         id="generated-id"
         style="width:500px;height:500px"
@@ -44,12 +42,10 @@ exports[`FormikCodeEditor renders 1`] = `
   class="euiCodeEditorWrapper"
   data-test-subj="codeEditorContainer"
 >
-  <div
+  <button
     class="euiCodeEditorKeyboardHint"
     data-test-subj="codeEditorHint"
     id="generated-id"
-    role="button"
-    tabindex="0"
   >
     <p
       class="euiText"
@@ -61,7 +57,7 @@ exports[`FormikCodeEditor renders 1`] = `
     >
       When you're done, press Escape to stop editing.
     </p>
-  </div>
+  </button>
   <div
     id="generated-id"
     style="width:500px;height:500px"
diff --git a/public/pages/CreateMonitor/components/AnomalyDetectors/EmptyFeaturesMessage/__snapshots__/EmptyFeaturesMessage.test.js.snap b/public/pages/CreateMonitor/components/AnomalyDetectors/EmptyFeaturesMessage/__snapshots__/EmptyFeaturesMessage.test.js.snap
index 8feb9fbd3..53b6690c9 100644
--- a/public/pages/CreateMonitor/components/AnomalyDetectors/EmptyFeaturesMessage/__snapshots__/EmptyFeaturesMessage.test.js.snap
+++ b/public/pages/CreateMonitor/components/AnomalyDetectors/EmptyFeaturesMessage/__snapshots__/EmptyFeaturesMessage.test.js.snap
@@ -24,9 +24,6 @@ exports[`EmptyFeaturesMessage renders  1`] = `
     <div
       class="euiSpacer euiSpacer--l"
     />
-    <div
-      class="euiSpacer euiSpacer--s"
-    />
     <div
       class="euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive"
     >
diff --git a/public/pages/CreateMonitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap b/public/pages/CreateMonitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap
index ce04d6453..016ead360 100644
--- a/public/pages/CreateMonitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap
+++ b/public/pages/CreateMonitor/components/ClusterMetricsMonitor/__snapshots__/ClusterMetricsMonitor.test.js.snap
@@ -42,6 +42,11 @@ exports[`ClusterMetricsMonitor renders 1`] = `
                 <div>
                   EuiIconMock
                 </div>
+                <span
+                  class="euiScreenReaderOnly"
+                >
+                  (opens in a new tab or window)
+                </span>
               </a>
             </div>
           </div>
@@ -155,12 +160,10 @@ exports[`ClusterMetricsMonitor renders 1`] = `
         data-test-subj="clusterMetricsRunResponseBox"
         style="width:100%;height:500px"
       >
-        <div
+        <button
           class="euiCodeEditorKeyboardHint"
           data-test-subj="codeEditorHint"
           id="generated-id"
-          role="button"
-          tabindex="0"
         >
           <p
             class="euiText"
@@ -172,7 +175,7 @@ exports[`ClusterMetricsMonitor renders 1`] = `
           >
             When you're done, press Escape to stop editing.
           </p>
-        </div>
+        </button>
         <div
           id="generated-id"
           style="width:100%;height:500px"
diff --git a/public/pages/CreateMonitor/components/ExtractionQuery/__snapshots__/ExtractionQuery.test.js.snap b/public/pages/CreateMonitor/components/ExtractionQuery/__snapshots__/ExtractionQuery.test.js.snap
index f9fd88ebb..f103f8843 100644
--- a/public/pages/CreateMonitor/components/ExtractionQuery/__snapshots__/ExtractionQuery.test.js.snap
+++ b/public/pages/CreateMonitor/components/ExtractionQuery/__snapshots__/ExtractionQuery.test.js.snap
@@ -30,12 +30,10 @@ exports[`ExtractionQuery renders 1`] = `
           data-test-subj="extractionQueryCodeEditor"
           style="width:100%;height:500px"
         >
-          <div
+          <button
             class="euiCodeEditorKeyboardHint"
             data-test-subj="codeEditorHint"
             id="generated-id"
-            role="button"
-            tabindex="0"
           >
             <p
               class="euiText"
@@ -47,7 +45,7 @@ exports[`ExtractionQuery renders 1`] = `
             >
               When you're done, press Escape to stop editing.
             </p>
-          </div>
+          </button>
           <div
             id="generated-id"
             style="width:100%;height:500px"
@@ -81,12 +79,10 @@ exports[`ExtractionQuery renders 1`] = `
           data-test-subj="codeEditorContainer"
           style="width:100%;height:500px"
         >
-          <div
+          <button
             class="euiCodeEditorKeyboardHint"
             data-test-subj="codeEditorHint"
             id="generated-id"
-            role="button"
-            tabindex="0"
           >
             <p
               class="euiText"
@@ -98,7 +94,7 @@ exports[`ExtractionQuery renders 1`] = `
             >
               When you're done, press Escape to stop editing.
             </p>
-          </div>
+          </button>
           <div
             id="generated-id"
             style="width:100%;height:500px"
diff --git a/public/pages/CreateMonitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap b/public/pages/CreateMonitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap
index bf0aed145..9ae797cde 100644
--- a/public/pages/CreateMonitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap
+++ b/public/pages/CreateMonitor/components/MonitorDefinitionCard/__snapshots__/MonitorDefinitionCard.test.js.snap
@@ -27,6 +27,11 @@ exports[`MonitorDefinitionCard renders without AD plugin 1`] = `
         <div>
           EuiIconMock
         </div>
+        <span
+          class="euiScreenReaderOnly"
+        >
+          (opens in a new tab or window)
+        </span>
       </a>
     </div>
   </div>
@@ -46,30 +51,30 @@ exports[`MonitorDefinitionCard renders without AD plugin 1`] = `
           class="euiFormRow__fieldWrapper"
         >
           <div
-            class="euiCheckableCard"
+            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
           >
             <div
-              class="euiCheckableCard__row"
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
             >
               <div
-                class="euiCheckableCard__control"
+                class="euiRadio euiRadio--noLabel"
+                data-test-subj="visualEditorRadioCard"
               >
+                <input
+                  class="euiRadio__input"
+                  id="visualEditorRadioCard"
+                  name="searchTypeGraph"
+                  type="radio"
+                  value="graph"
+                />
                 <div
-                  class="euiRadio euiRadio--noLabel"
-                  data-test-subj="visualEditorRadioCard"
-                >
-                  <input
-                    class="euiRadio__input"
-                    id="visualEditorRadioCard"
-                    name="searchTypeGraph"
-                    type="radio"
-                    value="graph"
-                  />
-                  <div
-                    class="euiRadio__circle"
-                  />
-                </div>
+                  class="euiRadio__circle"
+                />
               </div>
+            </div>
+            <div
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+            >
               <label
                 class="euiCheckableCard__label"
                 for="visualEditorRadioCard"
@@ -93,30 +98,30 @@ exports[`MonitorDefinitionCard renders without AD plugin 1`] = `
           class="euiFormRow__fieldWrapper"
         >
           <div
-            class="euiCheckableCard"
+            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
           >
             <div
-              class="euiCheckableCard__row"
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
             >
               <div
-                class="euiCheckableCard__control"
+                class="euiRadio euiRadio--noLabel"
+                data-test-subj="extractionQueryEditorRadioCard"
               >
+                <input
+                  class="euiRadio__input"
+                  id="extractionQueryEditorRadioCard"
+                  name="searchTypeQuery"
+                  type="radio"
+                  value="query"
+                />
                 <div
-                  class="euiRadio euiRadio--noLabel"
-                  data-test-subj="extractionQueryEditorRadioCard"
-                >
-                  <input
-                    class="euiRadio__input"
-                    id="extractionQueryEditorRadioCard"
-                    name="searchTypeQuery"
-                    type="radio"
-                    value="query"
-                  />
-                  <div
-                    class="euiRadio__circle"
-                  />
-                </div>
+                  class="euiRadio__circle"
+                />
               </div>
+            </div>
+            <div
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+            >
               <label
                 class="euiCheckableCard__label"
                 for="extractionQueryEditorRadioCard"
@@ -159,6 +164,11 @@ exports[`MonitorDefinitionCard renders without AD plugin 2`] = `
         <div>
           EuiIconMock
         </div>
+        <span
+          class="euiScreenReaderOnly"
+        >
+          (opens in a new tab or window)
+        </span>
       </a>
     </div>
   </div>
@@ -178,30 +188,30 @@ exports[`MonitorDefinitionCard renders without AD plugin 2`] = `
           class="euiFormRow__fieldWrapper"
         >
           <div
-            class="euiCheckableCard"
+            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
           >
             <div
-              class="euiCheckableCard__row"
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
             >
               <div
-                class="euiCheckableCard__control"
+                class="euiRadio euiRadio--noLabel"
+                data-test-subj="visualEditorRadioCard"
               >
+                <input
+                  class="euiRadio__input"
+                  id="visualEditorRadioCard"
+                  name="searchTypeGraph"
+                  type="radio"
+                  value="graph"
+                />
                 <div
-                  class="euiRadio euiRadio--noLabel"
-                  data-test-subj="visualEditorRadioCard"
-                >
-                  <input
-                    class="euiRadio__input"
-                    id="visualEditorRadioCard"
-                    name="searchTypeGraph"
-                    type="radio"
-                    value="graph"
-                  />
-                  <div
-                    class="euiRadio__circle"
-                  />
-                </div>
+                  class="euiRadio__circle"
+                />
               </div>
+            </div>
+            <div
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+            >
               <label
                 class="euiCheckableCard__label"
                 for="visualEditorRadioCard"
@@ -225,30 +235,30 @@ exports[`MonitorDefinitionCard renders without AD plugin 2`] = `
           class="euiFormRow__fieldWrapper"
         >
           <div
-            class="euiCheckableCard"
+            class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
           >
             <div
-              class="euiCheckableCard__row"
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
             >
               <div
-                class="euiCheckableCard__control"
+                class="euiRadio euiRadio--noLabel"
+                data-test-subj="extractionQueryEditorRadioCard"
               >
+                <input
+                  class="euiRadio__input"
+                  id="extractionQueryEditorRadioCard"
+                  name="searchTypeQuery"
+                  type="radio"
+                  value="query"
+                />
                 <div
-                  class="euiRadio euiRadio--noLabel"
-                  data-test-subj="extractionQueryEditorRadioCard"
-                >
-                  <input
-                    class="euiRadio__input"
-                    id="extractionQueryEditorRadioCard"
-                    name="searchTypeQuery"
-                    type="radio"
-                    value="query"
-                  />
-                  <div
-                    class="euiRadio__circle"
-                  />
-                </div>
+                  class="euiRadio__circle"
+                />
               </div>
+            </div>
+            <div
+              class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+            >
               <label
                 class="euiCheckableCard__label"
                 for="extractionQueryEditorRadioCard"
diff --git a/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OfExpression.test.js.snap b/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OfExpression.test.js.snap
index 5a16447e3..2e8822ad3 100644
--- a/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OfExpression.test.js.snap
+++ b/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OfExpression.test.js.snap
@@ -2,14 +2,14 @@
 
 exports[`OfExpression renders 1`] = `
 <div
-  class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
+  class="euiPopover euiPopover--anchorDownLeft"
   id="of-popover"
 >
   <div
     class="euiPopover__anchor"
   >
     <button
-      class="euiExpression euiExpression-isClickable euiExpression-isUppercase euiExpression--secondary"
+      class="euiExpression euiExpression-isClickable euiExpression-isUppercase euiExpression--success"
     >
       <span
         class="euiExpression__description"
diff --git a/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OverExpression.test.js.snap b/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OverExpression.test.js.snap
index 4a61f334d..0e90e9d7a 100644
--- a/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OverExpression.test.js.snap
+++ b/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/OverExpression.test.js.snap
@@ -2,14 +2,14 @@
 
 exports[`OverExpression renders 1`] = `
 <div
-  class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
+  class="euiPopover euiPopover--anchorDownLeft"
   id="over-popover"
 >
   <div
     class="euiPopover__anchor"
   >
     <button
-      class="euiExpression euiExpression-isClickable euiExpression-isUppercase euiExpression--secondary"
+      class="euiExpression euiExpression-isClickable euiExpression-isUppercase euiExpression--success"
     >
       <span
         class="euiExpression__description"
diff --git a/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/WhenExpression.test.js.snap b/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/WhenExpression.test.js.snap
index 038d9640e..084cdffda 100644
--- a/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/WhenExpression.test.js.snap
+++ b/public/pages/CreateMonitor/components/MonitorExpressions/expressions/__snapshots__/WhenExpression.test.js.snap
@@ -2,14 +2,14 @@
 
 exports[`WhenExpression renders 1`] = `
 <div
-  class="euiPopover euiPopover--anchorDownLeft euiPopover--withTitle"
+  class="euiPopover euiPopover--anchorDownLeft"
   id="when-popover"
 >
   <div
     class="euiPopover__anchor"
   >
     <button
-      class="euiExpression euiExpression-isClickable euiExpression-isUppercase euiExpression--secondary"
+      class="euiExpression euiExpression-isClickable euiExpression-isUppercase euiExpression--success"
     >
       <span
         class="euiExpression__description"
diff --git a/public/pages/CreateMonitor/components/MonitorTimeField/__snapshots__/MonitorTimeField.test.js.snap b/public/pages/CreateMonitor/components/MonitorTimeField/__snapshots__/MonitorTimeField.test.js.snap
index 97e5f5159..2f4224418 100644
--- a/public/pages/CreateMonitor/components/MonitorTimeField/__snapshots__/MonitorTimeField.test.js.snap
+++ b/public/pages/CreateMonitor/components/MonitorTimeField/__snapshots__/MonitorTimeField.test.js.snap
@@ -79,7 +79,7 @@ exports[`MonitorTimeField renders 1`] = `
     </div>
     <div
       class="euiFormHelpText euiFormRow__text"
-      id="timeField-form-row-help"
+      id="timeField-form-row-help-0"
     >
       Choose the time field you want to use for your x-axis
     </div>
diff --git a/public/pages/CreateMonitor/components/MonitorType/__snapshots__/MonitorType.test.js.snap b/public/pages/CreateMonitor/components/MonitorType/__snapshots__/MonitorType.test.js.snap
index 6a8ebd40f..4178b864f 100644
--- a/public/pages/CreateMonitor/components/MonitorType/__snapshots__/MonitorType.test.js.snap
+++ b/public/pages/CreateMonitor/components/MonitorType/__snapshots__/MonitorType.test.js.snap
@@ -25,30 +25,30 @@ exports[`MonitorType renders 1`] = `
         class="euiFormRow__fieldWrapper"
       >
         <div
-          class="euiCheckableCard"
+          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
         >
           <div
-            class="euiCheckableCard__row"
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
           >
             <div
-              class="euiCheckableCard__control"
+              class="euiRadio euiRadio--noLabel"
+              data-test-subj="queryLevelMonitorRadioCard"
             >
+              <input
+                class="euiRadio__input"
+                id="queryLevelMonitorRadioCard"
+                name="monitorTypeQueryLevel"
+                type="radio"
+                value="query_level_monitor"
+              />
               <div
-                class="euiRadio euiRadio--noLabel"
-                data-test-subj="queryLevelMonitorRadioCard"
-              >
-                <input
-                  class="euiRadio__input"
-                  id="queryLevelMonitorRadioCard"
-                  name="monitorTypeQueryLevel"
-                  type="radio"
-                  value="query_level_monitor"
-                />
-                <div
-                  class="euiRadio__circle"
-                />
-              </div>
+                class="euiRadio__circle"
+              />
             </div>
+          </div>
+          <div
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+          >
             <label
               aria-describedby="queryLevelMonitorRadioCard-details"
               class="euiCheckableCard__label"
@@ -56,13 +56,6 @@ exports[`MonitorType renders 1`] = `
             >
               Per query monitor
             </label>
-          </div>
-          <div
-            class="euiCheckableCard__row"
-          >
-            <div
-              class="euiCheckableCard__control"
-            />
             <div
               class="euiCheckableCard__children"
               id="queryLevelMonitorRadioCard-details"
@@ -94,30 +87,30 @@ exports[`MonitorType renders 1`] = `
         class="euiFormRow__fieldWrapper"
       >
         <div
-          class="euiCheckableCard"
+          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
         >
           <div
-            class="euiCheckableCard__row"
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
           >
             <div
-              class="euiCheckableCard__control"
+              class="euiRadio euiRadio--noLabel"
+              data-test-subj="bucketLevelMonitorRadioCard"
             >
+              <input
+                class="euiRadio__input"
+                id="bucketLevelMonitorRadioCard"
+                name="monitorTypeBucketLevel"
+                type="radio"
+                value="bucket_level_monitor"
+              />
               <div
-                class="euiRadio euiRadio--noLabel"
-                data-test-subj="bucketLevelMonitorRadioCard"
-              >
-                <input
-                  class="euiRadio__input"
-                  id="bucketLevelMonitorRadioCard"
-                  name="monitorTypeBucketLevel"
-                  type="radio"
-                  value="bucket_level_monitor"
-                />
-                <div
-                  class="euiRadio__circle"
-                />
-              </div>
+                class="euiRadio__circle"
+              />
             </div>
+          </div>
+          <div
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+          >
             <label
               aria-describedby="bucketLevelMonitorRadioCard-details"
               class="euiCheckableCard__label"
@@ -125,13 +118,6 @@ exports[`MonitorType renders 1`] = `
             >
               Per bucket monitor
             </label>
-          </div>
-          <div
-            class="euiCheckableCard__row"
-          >
-            <div
-              class="euiCheckableCard__control"
-            />
             <div
               class="euiCheckableCard__children"
               id="bucketLevelMonitorRadioCard-details"
@@ -163,30 +149,30 @@ exports[`MonitorType renders 1`] = `
         class="euiFormRow__fieldWrapper"
       >
         <div
-          class="euiCheckableCard"
+          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
         >
           <div
-            class="euiCheckableCard__row"
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
           >
             <div
-              class="euiCheckableCard__control"
+              class="euiRadio euiRadio--noLabel"
+              data-test-subj="clusterMetricsMonitorRadioCard"
             >
+              <input
+                class="euiRadio__input"
+                id="clusterMetricsMonitorRadioCard"
+                name="monitorTypeClusterMetrics"
+                type="radio"
+                value="cluster_metrics_monitor"
+              />
               <div
-                class="euiRadio euiRadio--noLabel"
-                data-test-subj="clusterMetricsMonitorRadioCard"
-              >
-                <input
-                  class="euiRadio__input"
-                  id="clusterMetricsMonitorRadioCard"
-                  name="monitorTypeClusterMetrics"
-                  type="radio"
-                  value="cluster_metrics_monitor"
-                />
-                <div
-                  class="euiRadio__circle"
-                />
-              </div>
+                class="euiRadio__circle"
+              />
             </div>
+          </div>
+          <div
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+          >
             <label
               aria-describedby="clusterMetricsMonitorRadioCard-details"
               class="euiCheckableCard__label"
@@ -194,13 +180,6 @@ exports[`MonitorType renders 1`] = `
             >
               Per cluster metrics monitor
             </label>
-          </div>
-          <div
-            class="euiCheckableCard__row"
-          >
-            <div
-              class="euiCheckableCard__control"
-            />
             <div
               class="euiCheckableCard__children"
               id="clusterMetricsMonitorRadioCard-details"
@@ -232,30 +211,30 @@ exports[`MonitorType renders 1`] = `
         class="euiFormRow__fieldWrapper"
       >
         <div
-          class="euiCheckableCard"
+          class="euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow euiPanel--hasBorder euiPanel--flexGrowZero euiSplitPanel euiSplitPanel--row euiCheckableCard"
         >
           <div
-            class="euiCheckableCard__row"
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--subdued euiPanel--noShadow euiPanel--noBorder euiPanel--flexGrowZero euiPanel--isClickable euiSplitPanel__inner"
           >
             <div
-              class="euiCheckableCard__control"
+              class="euiRadio euiRadio--noLabel"
+              data-test-subj="docLevelMonitorRadioCard"
             >
+              <input
+                class="euiRadio__input"
+                id="docLevelMonitorRadioCard"
+                name="monitorTypeDocLevel"
+                type="radio"
+                value="doc_level_monitor"
+              />
               <div
-                class="euiRadio euiRadio--noLabel"
-                data-test-subj="docLevelMonitorRadioCard"
-              >
-                <input
-                  class="euiRadio__input"
-                  id="docLevelMonitorRadioCard"
-                  name="monitorTypeDocLevel"
-                  type="radio"
-                  value="doc_level_monitor"
-                />
-                <div
-                  class="euiRadio__circle"
-                />
-              </div>
+                class="euiRadio__circle"
+              />
             </div>
+          </div>
+          <div
+            class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusNone euiPanel--transparent euiPanel--noShadow euiPanel--noBorder euiSplitPanel__inner"
+          >
             <label
               aria-describedby="docLevelMonitorRadioCard-details"
               class="euiCheckableCard__label"
@@ -263,13 +242,6 @@ exports[`MonitorType renders 1`] = `
             >
               Per document monitor
             </label>
-          </div>
-          <div
-            class="euiCheckableCard__row"
-          >
-            <div
-              class="euiCheckableCard__control"
-            />
             <div
               class="euiCheckableCard__children"
               id="docLevelMonitorRadioCard-details"
diff --git a/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap b/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
index e0117d4f0..fa380a6b7 100644
--- a/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
+++ b/public/pages/CreateMonitor/components/QueryPerformance/__snapshots__/QueryPerformance.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`QueryPerformance renders 1`] = `
 <div
-  class="euiPanel euiPanel--paddingMedium"
+  class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
   style="padding-left:10px;padding-right:10px"
 >
   <div
@@ -49,6 +49,11 @@ exports[`QueryPerformance renders 1`] = `
           <div>
             EuiIconMock
           </div>
+          <span
+            class="euiScreenReaderOnly"
+          >
+            (opens in a new tab or window)
+          </span>
         </a>
       </span>
     </div>
diff --git a/public/pages/CreateMonitor/components/Schedule/Frequencies/__snapshots__/Frequencies.test.js.snap b/public/pages/CreateMonitor/components/Schedule/Frequencies/__snapshots__/Frequencies.test.js.snap
index bf3e8d059..26847f1c2 100644
--- a/public/pages/CreateMonitor/components/Schedule/Frequencies/__snapshots__/Frequencies.test.js.snap
+++ b/public/pages/CreateMonitor/components/Schedule/Frequencies/__snapshots__/Frequencies.test.js.snap
@@ -38,7 +38,7 @@ exports[`Frequencies renders CustomCron 1`] = `
         </textarea>
         <div
           class="euiFormHelpText euiFormRow__text"
-          id="cronExpression-form-row-help"
+          id="cronExpression-form-row-help-0"
         >
           <div
             class="euiText euiText--small"
@@ -54,6 +54,11 @@ exports[`Frequencies renders CustomCron 1`] = `
               <div>
                 EuiIconMock
               </div>
+              <span
+                class="euiScreenReaderOnly"
+              >
+                (opens in a new tab or window)
+              </span>
             </a>
              for complex schedules
           </div>
diff --git a/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap b/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap
index 5753da187..4daf8404c 100644
--- a/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap
+++ b/public/pages/CreateMonitor/components/VisualGraph/__snapshots__/VisualGraph.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`VisualGraph renders 1`] = `
 <div
-  class="euiPanel euiPanel--paddingMedium"
+  class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
   style="padding-left:10px;padding-right:0px"
 >
   <div
@@ -541,7 +541,7 @@ exports[`VisualGraph renders 1`] = `
 
 exports[`VisualGraph renders with bucket level monitor 1`] = `
 <div
-  class="euiPanel euiPanel--paddingMedium"
+  class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
   style="padding-left:10px;padding-right:0px"
 >
   <div
diff --git a/public/pages/CreateMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap b/public/pages/CreateMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap
index 9a5d9e711..589431f1b 100644
--- a/public/pages/CreateMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap
+++ b/public/pages/CreateMonitor/containers/AnomalyDetectors/__tests__/__snapshots__/AnomalyDetector.test.js.snap
@@ -752,6 +752,7 @@ exports[`AnomalyDetectors renders 1`] = `
                                     </AutosizeInput>
                                   </div>
                                   <EuiFormControlLayoutIcons
+                                    compressed={false}
                                     icon={
                                       Object {
                                         "aria-label": "Open list of options",
@@ -772,6 +773,7 @@ exports[`AnomalyDetectors renders 1`] = `
                                         data-test-subj="comboBoxToggleListButton"
                                         iconRef={[Function]}
                                         onClick={[Function]}
+                                        size="m"
                                         type="arrowDown"
                                       >
                                         <button
@@ -784,6 +786,7 @@ exports[`AnomalyDetectors renders 1`] = `
                                           <EuiIcon
                                             aria-hidden="true"
                                             className="euiFormControlLayoutCustomIcon__icon"
+                                            size="m"
                                             type="arrowDown"
                                           >
                                             <div>
diff --git a/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap b/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap
index cc9024932..9abc3ae7f 100644
--- a/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap
+++ b/public/pages/CreateMonitor/containers/MonitorIndex/__snapshots__/MonitorIndex.test.js.snap
@@ -365,7 +365,7 @@ exports[`MonitorIndex renders 1`] = `
                   className="euiFormRow__fieldWrapper"
                 >
                   <ComboBox
-                    aria-describedby="index-form-row-help"
+                    aria-describedby="index-form-row-help-0"
                     field={
                       Object {
                         "name": "index",
@@ -734,6 +734,7 @@ exports[`MonitorIndex renders 1`] = `
                                   </AutosizeInput>
                                 </div>
                                 <EuiFormControlLayoutIcons
+                                  compressed={false}
                                   icon={
                                     Object {
                                       "aria-label": "Open list of options",
@@ -762,6 +763,7 @@ exports[`MonitorIndex renders 1`] = `
                                       data-test-subj="comboBoxToggleListButton"
                                       iconRef={[Function]}
                                       onClick={[Function]}
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <button
@@ -774,6 +776,7 @@ exports[`MonitorIndex renders 1`] = `
                                         <EuiIcon
                                           aria-hidden="true"
                                           className="euiFormControlLayoutCustomIcon__icon"
+                                          size="m"
                                           type="arrowDown"
                                         >
                                           <div>
@@ -793,11 +796,12 @@ exports[`MonitorIndex renders 1`] = `
                   </ComboBox>
                   <EuiFormHelpText
                     className="euiFormRow__text"
-                    id="index-form-row-help"
+                    id="index-form-row-help-0"
+                    key="You can use a * as a wildcard or date math index resolution in your index pattern"
                   >
                     <div
                       className="euiFormHelpText euiFormRow__text"
-                      id="index-form-row-help"
+                      id="index-form-row-help-0"
                     >
                       You can use a * as a wildcard or date math index resolution in your index pattern
                     </div>
diff --git a/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap b/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap
index e5ec21cde..f7c795f04 100644
--- a/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap
+++ b/public/pages/CreateTrigger/components/Action/__snapshots__/Action.test.js.snap
@@ -3,7 +3,7 @@
 exports[`Action renders with Notifications plugin installed 1`] = `
 <div>
   <div
-    class="euiPanel euiPanel--paddingMedium"
+    class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
     styles="[object Object]"
   >
     <div
@@ -55,7 +55,10 @@ exports[`Action renders with Notifications plugin installed 1`] = `
         </div>
       </div>
       <div
+        aria-labelledby="generated-id"
         class="euiAccordion__childWrapper"
+        role="region"
+        tabindex="-1"
       >
         <div>
           <div
@@ -101,7 +104,7 @@ exports[`Action renders with Notifications plugin installed 1`] = `
                   </div>
                   <div
                     class="euiFormHelpText euiFormRow__text"
-                    id="testPathactions.0.name-form-row-help"
+                    id="testPathactions.0.name-form-row-help-0"
                   >
                     Names can only contain letters, numbers, and special characters
                   </div>
@@ -300,6 +303,11 @@ exports[`Action renders with Notifications plugin installed 1`] = `
                               <div>
                                 EuiIconMock
                               </div>
+                              <span
+                                class="euiScreenReaderOnly"
+                              >
+                                (opens in a new tab or window)
+                              </span>
                             </a>
                           </div>
                         </div>
@@ -511,7 +519,7 @@ exports[`Action renders with Notifications plugin installed 1`] = `
                                   </div>
                                   <div
                                     class="euiFormHelpText euiFormRow__text"
-                                    id="testPathactions.0.throttle.value-form-row-help"
+                                    id="testPathactions.0.throttle.value-form-row-help-0"
                                   >
                                     Throttle value must be greater than 0 and less than 1440.
                                   </div>
@@ -537,7 +545,7 @@ exports[`Action renders with Notifications plugin installed 1`] = `
 exports[`Action renders without Notifications plugin installed 1`] = `
 <div>
   <div
-    class="euiPanel euiPanel--paddingMedium"
+    class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
     styles="[object Object]"
   >
     <div
@@ -589,7 +597,10 @@ exports[`Action renders without Notifications plugin installed 1`] = `
         </div>
       </div>
       <div
+        aria-labelledby="generated-id"
         class="euiAccordion__childWrapper"
+        role="region"
+        tabindex="-1"
       >
         <div>
           <div
@@ -635,7 +646,7 @@ exports[`Action renders without Notifications plugin installed 1`] = `
                   </div>
                   <div
                     class="euiFormHelpText euiFormRow__text"
-                    id="testPathactions.0.name-form-row-help"
+                    id="testPathactions.0.name-form-row-help-0"
                   >
                     Names can only contain letters, numbers, and special characters
                   </div>
@@ -780,27 +791,31 @@ exports[`Action renders without Notifications plugin installed 1`] = `
                     <div
                       class="euiText euiText--small"
                     >
-                      <p>
-                        Install the notifications plugin in order to create and select channels to send out notifications. 
-                        <a
-                          class="euiLink euiLink--primary"
-                          href="#"
-                          rel="noreferrer"
-                        >
-                          Learn more
-                        </a>
-                      </p>
-                      <div>
-                        <a
-                          class="euiLink euiLink--primary"
-                          href="#"
-                          rel="noreferrer"
-                        >
-                          EuiIconMock
-                        </a>
+                      <div
+                        class="euiTextColor euiTextColor--default"
+                      >
+                        <p>
+                          Install the notifications plugin in order to create and select channels to send out notifications. 
+                          <a
+                            class="euiLink euiLink--primary"
+                            href="#"
+                            rel="noreferrer"
+                          >
+                            Learn more
+                          </a>
+                        </p>
+                        <div>
+                          <a
+                            class="euiLink euiLink--primary"
+                            href="#"
+                            rel="noreferrer"
+                          >
+                            EuiIconMock
+                          </a>
+                        </div>
+                        .
+                        <p />
                       </div>
-                      .
-                      <p />
                     </div>
                   </div>
                   <div
@@ -883,6 +898,11 @@ exports[`Action renders without Notifications plugin installed 1`] = `
                               <div>
                                 EuiIconMock
                               </div>
+                              <span
+                                class="euiScreenReaderOnly"
+                              >
+                                (opens in a new tab or window)
+                              </span>
                             </a>
                           </div>
                         </div>
@@ -1094,7 +1114,7 @@ exports[`Action renders without Notifications plugin installed 1`] = `
                                   </div>
                                   <div
                                     class="euiFormHelpText euiFormRow__text"
-                                    id="testPathactions.0.throttle.value-form-row-help"
+                                    id="testPathactions.0.throttle.value-form-row-help-0"
                                   >
                                     Throttle value must be greater than 0 and less than 1440.
                                   </div>
diff --git a/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap b/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap
index 2f7ddbbc7..2d689a0b2 100644
--- a/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap
+++ b/public/pages/CreateTrigger/components/Action/actions/__snapshots__/Message.test.js.snap
@@ -76,6 +76,11 @@ exports[`Message renders 1`] = `
                 <div>
                   EuiIconMock
                 </div>
+                <span
+                  class="euiScreenReaderOnly"
+                >
+                  (opens in a new tab or window)
+                </span>
               </a>
             </div>
           </div>
@@ -287,7 +292,7 @@ exports[`Message renders 1`] = `
                     </div>
                     <div
                       class="euiFormHelpText euiFormRow__text"
-                      id="undefinedactions.0.throttle.value-form-row-help"
+                      id="undefinedactions.0.throttle.value-form-row-help-0"
                     >
                       Throttle value must be greater than 0 and less than 1440.
                     </div>
diff --git a/public/pages/CreateTrigger/components/NotificationsCallOut/__snapshots__/NotificationsCallOut.test.js.snap b/public/pages/CreateTrigger/components/NotificationsCallOut/__snapshots__/NotificationsCallOut.test.js.snap
index 3698ffafc..ea860fa69 100644
--- a/public/pages/CreateTrigger/components/NotificationsCallOut/__snapshots__/NotificationsCallOut.test.js.snap
+++ b/public/pages/CreateTrigger/components/NotificationsCallOut/__snapshots__/NotificationsCallOut.test.js.snap
@@ -20,27 +20,31 @@ exports[`NotifictionsCallOut renders 1`] = `
     <div
       class="euiText euiText--small"
     >
-      <p>
-        Install the notifications plugin in order to create and select channels to send out notifications. 
-        <a
-          class="euiLink euiLink--primary"
-          href="#"
-          rel="noreferrer"
-        >
-          Learn more
-        </a>
-      </p>
-      <div>
-        <a
-          class="euiLink euiLink--primary"
-          href="#"
-          rel="noreferrer"
-        >
-          EuiIconMock
-        </a>
+      <div
+        class="euiTextColor euiTextColor--default"
+      >
+        <p>
+          Install the notifications plugin in order to create and select channels to send out notifications. 
+          <a
+            class="euiLink euiLink--primary"
+            href="#"
+            rel="noreferrer"
+          >
+            Learn more
+          </a>
+        </p>
+        <div>
+          <a
+            class="euiLink euiLink--primary"
+            href="#"
+            rel="noreferrer"
+          >
+            EuiIconMock
+          </a>
+        </div>
+        .
+        <p />
       </div>
-      .
-      <p />
     </div>
   </div>
   <div
diff --git a/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap b/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap
index 32801493a..fb94a8bd7 100644
--- a/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap
+++ b/public/pages/Dashboard/components/DashboardControls/__snapshots__/DashboardControls.test.js.snap
@@ -15,7 +15,7 @@ exports[`DashboardControls renders 1`] = `
         class="euiFormControlLayout__childrenWrapper"
       >
         <input
-          class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+          class="euiFieldSearch euiFieldSearch--fullWidth"
           placeholder="Search"
           type="search"
           value=""
@@ -160,7 +160,7 @@ exports[`DashboardControls renders 1`] = `
     >
       <button
         aria-label="Previous page, 1"
-        class="euiButtonIcon euiButtonIcon--text"
+        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
         data-test-subj="pagination-button-previous"
         type="button"
       >
@@ -176,7 +176,7 @@ exports[`DashboardControls renders 1`] = `
         >
           <button
             aria-label="Page 1 of 2"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-0"
             type="button"
           >
@@ -197,7 +197,7 @@ exports[`DashboardControls renders 1`] = `
           <button
             aria-current="true"
             aria-label="Page 2 of 2"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-1"
             disabled=""
             type="button"
@@ -216,7 +216,7 @@ exports[`DashboardControls renders 1`] = `
       </ul>
       <button
         aria-label="Next page"
-        class="euiButtonIcon euiButtonIcon--text"
+        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
         data-test-subj="pagination-button-next"
         disabled=""
         type="button"
diff --git a/public/pages/Dashboard/components/DashboardEmptyPrompt/__snapshots__/DashboardEmptyPrompt.test.js.snap b/public/pages/Dashboard/components/DashboardEmptyPrompt/__snapshots__/DashboardEmptyPrompt.test.js.snap
index c079d842c..7bfe9d3b3 100644
--- a/public/pages/Dashboard/components/DashboardEmptyPrompt/__snapshots__/DashboardEmptyPrompt.test.js.snap
+++ b/public/pages/Dashboard/components/DashboardEmptyPrompt/__snapshots__/DashboardEmptyPrompt.test.js.snap
@@ -23,9 +23,6 @@ exports[`DashboardEmptyPrompt renders 1`] = `
   <div
     class="euiSpacer euiSpacer--l"
   />
-  <div
-    class="euiSpacer euiSpacer--s"
-  />
   <a
     class="euiButton euiButton--primary euiButton--fill"
     href="alerting#/create-monitor"
diff --git a/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap b/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap
index c35a36524..145cb32a6 100644
--- a/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap
+++ b/public/pages/Dashboard/containers/__snapshots__/Dashboard.test.js.snap
@@ -120,7 +120,7 @@ exports[`Dashboard renders in flyout 1`] = `
       }
     >
       <div
-        className="euiPanel euiPanel--paddingMedium"
+        className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
             "paddingLeft": "0px",
@@ -185,6 +185,7 @@ exports[`Dashboard renders in flyout 1`] = `
                           onClick={[Function]}
                         >
                           <EuiButtonDisplay
+                            baseClassName="euiButton"
                             data-test-subj="acknowledgeAlertsButton"
                             disabled={true}
                             element="button"
@@ -197,6 +198,11 @@ exports[`Dashboard renders in flyout 1`] = `
                               data-test-subj="acknowledgeAlertsButton"
                               disabled={true}
                               onClick={[Function]}
+                              style={
+                                Object {
+                                  "minWidth": undefined,
+                                }
+                              }
                               type="button"
                             >
                               <EuiButtonContent
@@ -326,7 +332,7 @@ exports[`Dashboard renders in flyout 1`] = `
                           >
                             <EuiValidatableControl>
                               <input
-                                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                className="euiFieldSearch euiFieldSearch--fullWidth"
                                 onChange={[Function]}
                                 onKeyUp={[Function]}
                                 placeholder="Search"
@@ -335,6 +341,7 @@ exports[`Dashboard renders in flyout 1`] = `
                               />
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon="search"
                               isLoading={false}
                             >
@@ -342,6 +349,7 @@ exports[`Dashboard renders in flyout 1`] = `
                                 className="euiFormControlLayoutIcons"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="search"
                                 >
                                   <span
@@ -350,6 +358,7 @@ exports[`Dashboard renders in flyout 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="search"
                                     >
                                       <div>
@@ -469,6 +478,7 @@ exports[`Dashboard renders in flyout 1`] = `
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -481,6 +491,7 @@ exports[`Dashboard renders in flyout 1`] = `
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -489,6 +500,7 @@ exports[`Dashboard renders in flyout 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -552,7 +564,7 @@ exports[`Dashboard renders in flyout 1`] = `
                             >
                               <button
                                 aria-label="Previous page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-previous"
                                 disabled={true}
                                 onClick={[Function]}
@@ -561,6 +573,7 @@ exports[`Dashboard renders in flyout 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowLeft"
                                 >
@@ -616,12 +629,12 @@ exports[`Dashboard renders in flyout 1`] = `
                                       data-test-subj="pagination-button-0"
                                       isDisabled={true}
                                       onClick={[Function]}
-                                      size="xs"
+                                      size="s"
                                     >
                                       <button
                                         aria-current={true}
                                         aria-label="Page 1 of 1"
-                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                         data-test-subj="pagination-button-0"
                                         disabled={true}
                                         onClick={[Function]}
@@ -630,6 +643,7 @@ exports[`Dashboard renders in flyout 1`] = `
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="left"
+                                          iconSize="m"
                                           textProps={
                                             Object {
                                               "className": "euiButtonEmpty__text",
@@ -677,7 +691,7 @@ exports[`Dashboard renders in flyout 1`] = `
                             >
                               <button
                                 aria-label="Next page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-next"
                                 disabled={true}
                                 onClick={[Function]}
@@ -686,6 +700,7 @@ exports[`Dashboard renders in flyout 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowRight"
                                 >
@@ -926,73 +941,65 @@ exports[`Dashboard renders in flyout 1`] = `
                                   ownFocus={true}
                                   panelPaddingSize="none"
                                 >
-                                  <EuiOutsideClickDetector
-                                    isDisabled={true}
-                                    onOutsideClick={[Function]}
+                                  <div
+                                    className="euiPopover euiPopover--anchorDownRight"
                                   >
                                     <div
-                                      className="euiPopover euiPopover--anchorDownRight"
-                                      onKeyDown={[Function]}
-                                      onMouseDown={[Function]}
-                                      onMouseUp={[Function]}
-                                      onTouchEnd={[Function]}
-                                      onTouchStart={[Function]}
+                                      className="euiPopover__anchor"
                                     >
-                                      <div
-                                        className="euiPopover__anchor"
+                                      <EuiButtonEmpty
+                                        flush="right"
+                                        iconSide="right"
+                                        iconType="arrowDown"
+                                        onClick={[Function]}
+                                        size="xs"
                                       >
-                                        <EuiButtonEmpty
-                                          flush="right"
-                                          iconSide="right"
-                                          iconType="arrowDown"
+                                        <button
+                                          className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+                                          disabled={false}
                                           onClick={[Function]}
-                                          size="xs"
+                                          type="button"
                                         >
-                                          <button
-                                            className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                                            disabled={false}
-                                            onClick={[Function]}
-                                            type="button"
-                                          >
-                                            <EuiButtonContent
-                                              className="euiButtonEmpty__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
-                                                Object {
-                                                  "className": "euiButtonEmpty__text",
-                                                }
+                                          <EuiButtonContent
+                                            className="euiButtonEmpty__content"
+                                            iconSide="right"
+                                            iconSize="s"
+                                            iconType="arrowDown"
+                                            textProps={
+                                              Object {
+                                                "className": "euiButtonEmpty__text",
                                               }
+                                            }
+                                          >
+                                            <span
+                                              className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                                             >
+                                              <EuiIcon
+                                                className="euiButtonContent__icon"
+                                                color="inherit"
+                                                size="s"
+                                                type="arrowDown"
+                                              >
+                                                <div>
+                                                  EuiIconMock
+                                                </div>
+                                              </EuiIcon>
                                               <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                                                className="euiButtonEmpty__text"
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  size="m"
-                                                  type="arrowDown"
-                                                >
-                                                  <div>
-                                                    EuiIconMock
-                                                  </div>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButtonEmpty__text"
+                                                <EuiI18n
+                                                  default="Sorting"
+                                                  token="euiTableSortMobile.sorting"
                                                 >
-                                                  <EuiI18n
-                                                    default="Sorting"
-                                                    token="euiTableSortMobile.sorting"
-                                                  >
-                                                    Sorting
-                                                  </EuiI18n>
-                                                </span>
+                                                  Sorting
+                                                </EuiI18n>
                                               </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonEmpty>
-                                      </div>
+                                            </span>
+                                          </EuiButtonContent>
+                                        </button>
+                                      </EuiButtonEmpty>
                                     </div>
-                                  </EuiOutsideClickDetector>
+                                  </div>
                                 </EuiPopover>
                               </div>
                             </EuiTableSortMobile>
@@ -1104,39 +1111,35 @@ exports[`Dashboard renders in flyout 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSortAscending={false}
+                                  isSorted={true}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "descending",
-                                          "innerText": "Alert start time",
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
+                                      <EuiI18n
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Alert start time",
+                                          }
                                         }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Alert start time; Sorted in descending order"
                                       >
-                                        Alert start time
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiI18n
-                                    default="Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.sortedAriaLabel"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "descending",
-                                      }
-                                    }
-                                  >
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Alert start time"
+                                        >
+                                          Alert start time
+                                        </span>
+                                      </EuiI18n>
+                                    </EuiInnerText>
                                     <EuiIcon
-                                      aria-label="Sorted in descending order"
                                       className="euiTableSortIcon"
                                       size="m"
                                       type="sortDown"
@@ -1145,20 +1148,8 @@ exports[`Dashboard renders in flyout 1`] = `
                                         EuiIconMock
                                       </div>
                                     </EuiIcon>
-                                  </EuiI18n>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
-                                      <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
-                                      >
-                                        Click to sort in ascending order
-                                      </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -1188,41 +1179,35 @@ exports[`Dashboard renders in flyout 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Alert end time",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Alert end time"
-                                      >
-                                        Alert end time
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Alert end time",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Alert end time"
+                                        >
+                                          Alert end time
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -1252,41 +1237,35 @@ exports[`Dashboard renders in flyout 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Trigger name",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Trigger name"
-                                      >
-                                        Trigger name
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Trigger name",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Trigger name"
+                                        >
+                                          Trigger name
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -1306,18 +1285,34 @@ exports[`Dashboard renders in flyout 1`] = `
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="Severity"
-                                  >
-                                    Severity
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "Severity",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="Severity"
+                                      >
+                                        Severity
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                           <EuiTableHeaderCell
@@ -1336,18 +1331,34 @@ exports[`Dashboard renders in flyout 1`] = `
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="State"
-                                  >
-                                    State
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "State",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="State"
+                                      >
+                                        State
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                           <EuiTableHeaderCell
@@ -1376,41 +1387,35 @@ exports[`Dashboard renders in flyout 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Time acknowledged",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Time acknowledged"
-                                      >
-                                        Time acknowledged
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Time acknowledged",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Time acknowledged"
+                                        >
+                                          Time acknowledged
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -1504,18 +1509,12 @@ exports[`Dashboard renders in flyout 1`] = `
                                               className="euiSpacer euiSpacer--l"
                                             />
                                           </EuiSpacer>
-                                          <EuiSpacer
-                                            size="s"
-                                          >
-                                            <div
-                                              className="euiSpacer euiSpacer--s"
-                                            />
-                                          </EuiSpacer>
                                           <EuiButton
                                             fill={true}
                                             href="alerting#/create-monitor"
                                           >
                                             <EuiButtonDisplay
+                                              baseClassName="euiButton"
                                               element="a"
                                               fill={true}
                                               href="alerting#/create-monitor"
@@ -1524,8 +1523,14 @@ exports[`Dashboard renders in flyout 1`] = `
                                             >
                                               <a
                                                 className="euiButton euiButton--primary euiButton--fill"
+                                                disabled={false}
                                                 href="alerting#/create-monitor"
                                                 rel="noreferrer"
+                                                style={
+                                                  Object {
+                                                    "minWidth": undefined,
+                                                  }
+                                                }
                                               >
                                                 <EuiButtonContent
                                                   className="euiButton__content"
@@ -1657,7 +1662,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
       }
     >
       <div
-        className="euiPanel euiPanel--paddingMedium"
+        className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
             "paddingLeft": "0px",
@@ -1721,6 +1726,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                           onClick={[Function]}
                         >
                           <EuiButtonDisplay
+                            baseClassName="euiButton"
                             disabled={true}
                             element="button"
                             isDisabled={true}
@@ -1731,6 +1737,11 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                               className="euiButton euiButton--primary euiButton-isDisabled"
                               disabled={true}
                               onClick={[Function]}
+                              style={
+                                Object {
+                                  "minWidth": undefined,
+                                }
+                              }
                               type="button"
                             >
                               <EuiButtonContent
@@ -1769,6 +1780,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                           onClick={[Function]}
                         >
                           <EuiButtonDisplay
+                            baseClassName="euiButton"
                             data-test-subj="acknowledgeAlertsButton"
                             disabled={true}
                             element="button"
@@ -1781,6 +1793,11 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                               data-test-subj="acknowledgeAlertsButton"
                               disabled={true}
                               onClick={[Function]}
+                              style={
+                                Object {
+                                  "minWidth": undefined,
+                                }
+                              }
                               type="button"
                             >
                               <EuiButtonContent
@@ -1910,7 +1927,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                           >
                             <EuiValidatableControl>
                               <input
-                                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                className="euiFieldSearch euiFieldSearch--fullWidth"
                                 onChange={[Function]}
                                 onKeyUp={[Function]}
                                 placeholder="Search"
@@ -1919,6 +1936,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                               />
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon="search"
                               isLoading={false}
                             >
@@ -1926,6 +1944,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 className="euiFormControlLayoutIcons"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="search"
                                 >
                                   <span
@@ -1934,6 +1953,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="search"
                                     >
                                       <div>
@@ -2051,6 +2071,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -2063,6 +2084,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -2071,6 +2093,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -2190,6 +2213,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -2202,6 +2226,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -2210,6 +2235,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -2273,7 +2299,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                             >
                               <button
                                 aria-label="Previous page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-previous"
                                 disabled={true}
                                 onClick={[Function]}
@@ -2282,6 +2308,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowLeft"
                                 >
@@ -2337,12 +2364,12 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                       data-test-subj="pagination-button-0"
                                       isDisabled={true}
                                       onClick={[Function]}
-                                      size="xs"
+                                      size="s"
                                     >
                                       <button
                                         aria-current={true}
                                         aria-label="Page 1 of 1"
-                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                         data-test-subj="pagination-button-0"
                                         disabled={true}
                                         onClick={[Function]}
@@ -2351,6 +2378,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="left"
+                                          iconSize="m"
                                           textProps={
                                             Object {
                                               "className": "euiButtonEmpty__text",
@@ -2398,7 +2426,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                             >
                               <button
                                 aria-label="Next page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-next"
                                 disabled={true}
                                 onClick={[Function]}
@@ -2407,6 +2435,7 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowRight"
                                 >
@@ -2680,73 +2709,65 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                   ownFocus={true}
                                   panelPaddingSize="none"
                                 >
-                                  <EuiOutsideClickDetector
-                                    isDisabled={true}
-                                    onOutsideClick={[Function]}
+                                  <div
+                                    className="euiPopover euiPopover--anchorDownRight"
                                   >
                                     <div
-                                      className="euiPopover euiPopover--anchorDownRight"
-                                      onKeyDown={[Function]}
-                                      onMouseDown={[Function]}
-                                      onMouseUp={[Function]}
-                                      onTouchEnd={[Function]}
-                                      onTouchStart={[Function]}
+                                      className="euiPopover__anchor"
                                     >
-                                      <div
-                                        className="euiPopover__anchor"
+                                      <EuiButtonEmpty
+                                        flush="right"
+                                        iconSide="right"
+                                        iconType="arrowDown"
+                                        onClick={[Function]}
+                                        size="xs"
                                       >
-                                        <EuiButtonEmpty
-                                          flush="right"
-                                          iconSide="right"
-                                          iconType="arrowDown"
+                                        <button
+                                          className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+                                          disabled={false}
                                           onClick={[Function]}
-                                          size="xs"
+                                          type="button"
                                         >
-                                          <button
-                                            className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                                            disabled={false}
-                                            onClick={[Function]}
-                                            type="button"
-                                          >
-                                            <EuiButtonContent
-                                              className="euiButtonEmpty__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
-                                                Object {
-                                                  "className": "euiButtonEmpty__text",
-                                                }
+                                          <EuiButtonContent
+                                            className="euiButtonEmpty__content"
+                                            iconSide="right"
+                                            iconSize="s"
+                                            iconType="arrowDown"
+                                            textProps={
+                                              Object {
+                                                "className": "euiButtonEmpty__text",
                                               }
+                                            }
+                                          >
+                                            <span
+                                              className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                                             >
+                                              <EuiIcon
+                                                className="euiButtonContent__icon"
+                                                color="inherit"
+                                                size="s"
+                                                type="arrowDown"
+                                              >
+                                                <div>
+                                                  EuiIconMock
+                                                </div>
+                                              </EuiIcon>
                                               <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                                                className="euiButtonEmpty__text"
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  size="m"
-                                                  type="arrowDown"
-                                                >
-                                                  <div>
-                                                    EuiIconMock
-                                                  </div>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButtonEmpty__text"
+                                                <EuiI18n
+                                                  default="Sorting"
+                                                  token="euiTableSortMobile.sorting"
                                                 >
-                                                  <EuiI18n
-                                                    default="Sorting"
-                                                    token="euiTableSortMobile.sorting"
-                                                  >
-                                                    Sorting
-                                                  </EuiI18n>
-                                                </span>
+                                                  Sorting
+                                                </EuiI18n>
                                               </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonEmpty>
-                                      </div>
+                                            </span>
+                                          </EuiButtonContent>
+                                        </button>
+                                      </EuiButtonEmpty>
                                     </div>
-                                  </EuiOutsideClickDetector>
+                                  </div>
                                 </EuiPopover>
                               </div>
                             </EuiTableSortMobile>
@@ -2857,41 +2878,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Alerts",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Alerts"
-                                      >
-                                        Alerts
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Alerts",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Alerts"
+                                        >
+                                          Alerts
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -2921,41 +2936,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Active",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Active"
-                                      >
-                                        Active
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Active",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Active"
+                                        >
+                                          Active
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -2985,41 +2994,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Acknowledged",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Acknowledged"
-                                      >
-                                        Acknowledged
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Acknowledged",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Acknowledged"
+                                        >
+                                          Acknowledged
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3049,41 +3052,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Errors",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Errors"
-                                      >
-                                        Errors
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Errors",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Errors"
+                                        >
+                                          Errors
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3113,41 +3110,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Trigger name",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Trigger name"
-                                      >
-                                        Trigger name
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Trigger name",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Trigger name"
+                                        >
+                                          Trigger name
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3178,39 +3169,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSortAscending={false}
+                                  isSorted={true}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "descending",
-                                          "innerText": "Trigger start time",
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
+                                      <EuiI18n
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Trigger start time",
+                                          }
                                         }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Trigger start time; Sorted in descending order"
                                       >
-                                        Trigger start time
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiI18n
-                                    default="Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.sortedAriaLabel"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "descending",
-                                      }
-                                    }
-                                  >
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Trigger start time"
+                                        >
+                                          Trigger start time
+                                        </span>
+                                      </EuiI18n>
+                                    </EuiInnerText>
                                     <EuiIcon
-                                      aria-label="Sorted in descending order"
                                       className="euiTableSortIcon"
                                       size="m"
                                       type="sortDown"
@@ -3219,20 +3206,8 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                         EuiIconMock
                                       </div>
                                     </EuiIcon>
-                                  </EuiI18n>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
-                                      <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
-                                      >
-                                        Click to sort in ascending order
-                                      </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3262,41 +3237,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Trigger last updated",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Trigger last updated"
-                                      >
-                                        Trigger last updated
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Trigger last updated",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Trigger last updated"
+                                        >
+                                          Trigger last updated
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3316,18 +3285,34 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="Severity"
-                                  >
-                                    Severity
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "Severity",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="Severity"
+                                      >
+                                        Severity
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                           <EuiTableHeaderCell
@@ -3356,41 +3341,35 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Monitor name",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Monitor name"
-                                      >
-                                        Monitor name
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Monitor name",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Monitor name"
+                                        >
+                                          Monitor name
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3484,18 +3463,12 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                               className="euiSpacer euiSpacer--l"
                                             />
                                           </EuiSpacer>
-                                          <EuiSpacer
-                                            size="s"
-                                          >
-                                            <div
-                                              className="euiSpacer euiSpacer--s"
-                                            />
-                                          </EuiSpacer>
                                           <EuiButton
                                             fill={true}
                                             href="alerting#/create-monitor"
                                           >
                                             <EuiButtonDisplay
+                                              baseClassName="euiButton"
                                               element="a"
                                               fill={true}
                                               href="alerting#/create-monitor"
@@ -3504,8 +3477,14 @@ exports[`Dashboard renders with alert by triggers view 1`] = `
                                             >
                                               <a
                                                 className="euiButton euiButton--primary euiButton--fill"
+                                                disabled={false}
                                                 href="alerting#/create-monitor"
                                                 rel="noreferrer"
+                                                style={
+                                                  Object {
+                                                    "minWidth": undefined,
+                                                  }
+                                                }
                                               >
                                                 <EuiButtonContent
                                                   className="euiButton__content"
@@ -3631,7 +3610,7 @@ exports[`Dashboard renders with per alert view 1`] = `
       }
     >
       <div
-        className="euiPanel euiPanel--paddingMedium"
+        className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
             "paddingLeft": "0px",
@@ -3696,6 +3675,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                           onClick={[Function]}
                         >
                           <EuiButtonDisplay
+                            baseClassName="euiButton"
                             data-test-subj="acknowledgeAlertsButton"
                             disabled={true}
                             element="button"
@@ -3708,6 +3688,11 @@ exports[`Dashboard renders with per alert view 1`] = `
                               data-test-subj="acknowledgeAlertsButton"
                               disabled={true}
                               onClick={[Function]}
+                              style={
+                                Object {
+                                  "minWidth": undefined,
+                                }
+                              }
                               type="button"
                             >
                               <EuiButtonContent
@@ -3837,7 +3822,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                           >
                             <EuiValidatableControl>
                               <input
-                                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                className="euiFieldSearch euiFieldSearch--fullWidth"
                                 onChange={[Function]}
                                 onKeyUp={[Function]}
                                 placeholder="Search"
@@ -3846,6 +3831,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                               />
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon="search"
                               isLoading={false}
                             >
@@ -3853,6 +3839,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 className="euiFormControlLayoutIcons"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="search"
                                 >
                                   <span
@@ -3861,6 +3848,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="search"
                                     >
                                       <div>
@@ -3978,6 +3966,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -3990,6 +3979,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -3998,6 +3988,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -4117,6 +4108,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -4129,6 +4121,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -4137,6 +4130,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -4200,7 +4194,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                             >
                               <button
                                 aria-label="Previous page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-previous"
                                 disabled={true}
                                 onClick={[Function]}
@@ -4209,6 +4203,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowLeft"
                                 >
@@ -4264,12 +4259,12 @@ exports[`Dashboard renders with per alert view 1`] = `
                                       data-test-subj="pagination-button-0"
                                       isDisabled={true}
                                       onClick={[Function]}
-                                      size="xs"
+                                      size="s"
                                     >
                                       <button
                                         aria-current={true}
                                         aria-label="Page 1 of 1"
-                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                         data-test-subj="pagination-button-0"
                                         disabled={true}
                                         onClick={[Function]}
@@ -4278,6 +4273,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="left"
+                                          iconSize="m"
                                           textProps={
                                             Object {
                                               "className": "euiButtonEmpty__text",
@@ -4325,7 +4321,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                             >
                               <button
                                 aria-label="Next page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-next"
                                 disabled={true}
                                 onClick={[Function]}
@@ -4334,6 +4330,7 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowRight"
                                 >
@@ -4574,73 +4571,65 @@ exports[`Dashboard renders with per alert view 1`] = `
                                   ownFocus={true}
                                   panelPaddingSize="none"
                                 >
-                                  <EuiOutsideClickDetector
-                                    isDisabled={true}
-                                    onOutsideClick={[Function]}
+                                  <div
+                                    className="euiPopover euiPopover--anchorDownRight"
                                   >
                                     <div
-                                      className="euiPopover euiPopover--anchorDownRight"
-                                      onKeyDown={[Function]}
-                                      onMouseDown={[Function]}
-                                      onMouseUp={[Function]}
-                                      onTouchEnd={[Function]}
-                                      onTouchStart={[Function]}
+                                      className="euiPopover__anchor"
                                     >
-                                      <div
-                                        className="euiPopover__anchor"
+                                      <EuiButtonEmpty
+                                        flush="right"
+                                        iconSide="right"
+                                        iconType="arrowDown"
+                                        onClick={[Function]}
+                                        size="xs"
                                       >
-                                        <EuiButtonEmpty
-                                          flush="right"
-                                          iconSide="right"
-                                          iconType="arrowDown"
+                                        <button
+                                          className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+                                          disabled={false}
                                           onClick={[Function]}
-                                          size="xs"
+                                          type="button"
                                         >
-                                          <button
-                                            className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                                            disabled={false}
-                                            onClick={[Function]}
-                                            type="button"
-                                          >
-                                            <EuiButtonContent
-                                              className="euiButtonEmpty__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
-                                                Object {
-                                                  "className": "euiButtonEmpty__text",
-                                                }
+                                          <EuiButtonContent
+                                            className="euiButtonEmpty__content"
+                                            iconSide="right"
+                                            iconSize="s"
+                                            iconType="arrowDown"
+                                            textProps={
+                                              Object {
+                                                "className": "euiButtonEmpty__text",
                                               }
+                                            }
+                                          >
+                                            <span
+                                              className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                                             >
+                                              <EuiIcon
+                                                className="euiButtonContent__icon"
+                                                color="inherit"
+                                                size="s"
+                                                type="arrowDown"
+                                              >
+                                                <div>
+                                                  EuiIconMock
+                                                </div>
+                                              </EuiIcon>
                                               <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                                                className="euiButtonEmpty__text"
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  size="m"
-                                                  type="arrowDown"
+                                                <EuiI18n
+                                                  default="Sorting"
+                                                  token="euiTableSortMobile.sorting"
                                                 >
-                                                  <div>
-                                                    EuiIconMock
-                                                  </div>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButtonEmpty__text"
-                                                >
-                                                  <EuiI18n
-                                                    default="Sorting"
-                                                    token="euiTableSortMobile.sorting"
-                                                  >
-                                                    Sorting
-                                                  </EuiI18n>
-                                                </span>
+                                                  Sorting
+                                                </EuiI18n>
                                               </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonEmpty>
-                                      </div>
+                                            </span>
+                                          </EuiButtonContent>
+                                        </button>
+                                      </EuiButtonEmpty>
                                     </div>
-                                  </EuiOutsideClickDetector>
+                                  </div>
                                 </EuiPopover>
                               </div>
                             </EuiTableSortMobile>
@@ -4752,39 +4741,35 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSortAscending={false}
+                                  isSorted={true}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "descending",
-                                          "innerText": "Alert start time",
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
+                                      <EuiI18n
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Alert start time",
+                                          }
                                         }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Alert start time; Sorted in descending order"
                                       >
-                                        Alert start time
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiI18n
-                                    default="Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.sortedAriaLabel"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "descending",
-                                      }
-                                    }
-                                  >
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Alert start time"
+                                        >
+                                          Alert start time
+                                        </span>
+                                      </EuiI18n>
+                                    </EuiInnerText>
                                     <EuiIcon
-                                      aria-label="Sorted in descending order"
                                       className="euiTableSortIcon"
                                       size="m"
                                       type="sortDown"
@@ -4793,20 +4778,8 @@ exports[`Dashboard renders with per alert view 1`] = `
                                         EuiIconMock
                                       </div>
                                     </EuiIcon>
-                                  </EuiI18n>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
-                                      <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
-                                      >
-                                        Click to sort in ascending order
-                                      </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -4836,41 +4809,35 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Alert end time",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Alert end time"
-                                      >
-                                        Alert end time
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Alert end time",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Alert end time"
+                                        >
+                                          Alert end time
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -4900,41 +4867,35 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Trigger name",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Trigger name"
-                                      >
-                                        Trigger name
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Trigger name",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Trigger name"
+                                        >
+                                          Trigger name
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -4954,18 +4915,34 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="Severity"
-                                  >
-                                    Severity
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "Severity",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="Severity"
+                                      >
+                                        Severity
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                           <EuiTableHeaderCell
@@ -4984,18 +4961,34 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="State"
-                                  >
-                                    State
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "State",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="State"
+                                      >
+                                        State
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                           <EuiTableHeaderCell
@@ -5024,41 +5017,35 @@ exports[`Dashboard renders with per alert view 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Time acknowledged",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Time acknowledged"
-                                      >
-                                        Time acknowledged
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Time acknowledged",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Time acknowledged"
+                                        >
+                                          Time acknowledged
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -5152,18 +5139,12 @@ exports[`Dashboard renders with per alert view 1`] = `
                                               className="euiSpacer euiSpacer--l"
                                             />
                                           </EuiSpacer>
-                                          <EuiSpacer
-                                            size="s"
-                                          >
-                                            <div
-                                              className="euiSpacer euiSpacer--s"
-                                            />
-                                          </EuiSpacer>
                                           <EuiButton
                                             fill={true}
                                             href="alerting#/create-monitor"
                                           >
                                             <EuiButtonDisplay
+                                              baseClassName="euiButton"
                                               element="a"
                                               fill={true}
                                               href="alerting#/create-monitor"
@@ -5172,8 +5153,14 @@ exports[`Dashboard renders with per alert view 1`] = `
                                             >
                                               <a
                                                 className="euiButton euiButton--primary euiButton--fill"
+                                                disabled={false}
                                                 href="alerting#/create-monitor"
                                                 rel="noreferrer"
+                                                style={
+                                                  Object {
+                                                    "minWidth": undefined,
+                                                  }
+                                                }
                                               >
                                                 <EuiButtonContent
                                                   className="euiButton__content"
diff --git a/public/pages/Destinations/components/DestinationsList/DestinationsControls/__snapshots__/DestinationsControls.test.js.snap b/public/pages/Destinations/components/DestinationsList/DestinationsControls/__snapshots__/DestinationsControls.test.js.snap
index 2e003a872..9750f8718 100644
--- a/public/pages/Destinations/components/DestinationsList/DestinationsControls/__snapshots__/DestinationsControls.test.js.snap
+++ b/public/pages/Destinations/components/DestinationsList/DestinationsControls/__snapshots__/DestinationsControls.test.js.snap
@@ -15,7 +15,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
         class="euiFormControlLayout__childrenWrapper"
       >
         <input
-          class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+          class="euiFieldSearch euiFieldSearch--fullWidth"
           placeholder="Search"
           type="search"
           value=""
@@ -96,7 +96,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
     >
       <button
         aria-label="Previous page"
-        class="euiButtonIcon euiButtonIcon--text"
+        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
         data-test-subj="pagination-button-previous"
         disabled=""
         type="button"
@@ -114,7 +114,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
           <button
             aria-current="true"
             aria-label="Page 1 of 10"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-0"
             disabled=""
             type="button"
@@ -135,7 +135,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
         >
           <button
             aria-label="Page 2 of 10"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-1"
             type="button"
           >
@@ -155,7 +155,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
         >
           <button
             aria-label="Page 3 of 10"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-2"
             type="button"
           >
@@ -175,7 +175,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
         >
           <button
             aria-label="Page 4 of 10"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-3"
             type="button"
           >
@@ -195,7 +195,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
         >
           <button
             aria-label="Page 5 of 10"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-4"
             type="button"
           >
@@ -221,7 +221,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
         >
           <button
             aria-label="Page 10 of 10"
-            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiPaginationButton euiPaginationButton--hideOnMobile"
+            class="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiPaginationButton euiPaginationButton--hideOnMobile"
             data-test-subj="pagination-button-9"
             type="button"
           >
@@ -239,7 +239,7 @@ exports[`<DestinationsControls /> should render DestinationsControls 1`] = `
       </ul>
       <button
         aria-label="Next page, 2"
-        class="euiButtonIcon euiButtonIcon--text"
+        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
         data-test-subj="pagination-button-next"
         type="button"
       >
diff --git a/public/pages/Destinations/components/DestinationsList/EmptyDestinations/__snapshots__/EmptyDestinations.test.js.snap b/public/pages/Destinations/components/DestinationsList/EmptyDestinations/__snapshots__/EmptyDestinations.test.js.snap
index 49e7285f3..fc8f47a84 100644
--- a/public/pages/Destinations/components/DestinationsList/EmptyDestinations/__snapshots__/EmptyDestinations.test.js.snap
+++ b/public/pages/Destinations/components/DestinationsList/EmptyDestinations/__snapshots__/EmptyDestinations.test.js.snap
@@ -46,9 +46,6 @@ exports[`<EmptyDestinations /> should render no results for filter criteria 1`]
   <div
     class="euiSpacer euiSpacer--l"
   />
-  <div
-    class="euiSpacer euiSpacer--s"
-  />
   <button
     class="euiButton euiButton--primary euiButton--fill"
     type="button"
diff --git a/public/pages/Destinations/components/NotificationsInfoCallOut/__snapshots__/NotificationsInfoCallOut.test.js.snap b/public/pages/Destinations/components/NotificationsInfoCallOut/__snapshots__/NotificationsInfoCallOut.test.js.snap
index d5dbee22b..0e03bbd9b 100644
--- a/public/pages/Destinations/components/NotificationsInfoCallOut/__snapshots__/NotificationsInfoCallOut.test.js.snap
+++ b/public/pages/Destinations/components/NotificationsInfoCallOut/__snapshots__/NotificationsInfoCallOut.test.js.snap
@@ -17,28 +17,32 @@ exports[`NotificationsInfoCallOut renders when Notifications plugin is installed
     <div
       class="euiText euiText--small"
     >
-      <p>
-        Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
-      </p>
       <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <a
-        class="euiButton euiButton--primary"
-        href="/app/notifications-dashboards#/channels"
-        rel="noreferrer"
+        class="euiTextColor euiTextColor--default"
       >
-        <span
-          class="euiButtonContent euiButton__content"
+        <p>
+          Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
+        </p>
+        <div
+          class="euiSpacer euiSpacer--l"
+        />
+        <a
+          class="euiButton euiButton--primary"
+          href="/app/notifications-dashboards#/channels"
+          rel="noreferrer"
         >
           <span
-            class="euiButton__text"
+            class="euiButtonContent euiButton__content"
           >
-            View Notifications
+            <span
+              class="euiButton__text"
+            >
+              View Notifications
+            </span>
           </span>
-        </span>
-      </a>
-      <p />
+        </a>
+        <p />
+      </div>
     </div>
   </div>
   <div
@@ -64,13 +68,17 @@ exports[`NotificationsInfoCallOut renders when Notifications plugin is not insta
     <div
       class="euiText euiText--small"
     >
-      <p>
-        Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
-      </p>
       <div
-        class="euiSpacer euiSpacer--l"
-      />
-      <p />
+        class="euiTextColor euiTextColor--default"
+      >
+        <p>
+          Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
+        </p>
+        <div
+          class="euiSpacer euiSpacer--l"
+        />
+        <p />
+      </div>
     </div>
   </div>
   <div
diff --git a/public/pages/Destinations/containers/CreateDestination/ManageEmailGroups/__snapshots__/ManageEmailGroups.test.js.snap b/public/pages/Destinations/containers/CreateDestination/ManageEmailGroups/__snapshots__/ManageEmailGroups.test.js.snap
index 050859c47..481d1214a 100644
--- a/public/pages/Destinations/containers/CreateDestination/ManageEmailGroups/__snapshots__/ManageEmailGroups.test.js.snap
+++ b/public/pages/Destinations/containers/CreateDestination/ManageEmailGroups/__snapshots__/ManageEmailGroups.test.js.snap
@@ -27,78 +27,10 @@ exports[`ManageEmailGroups renders when email is disallowed 1`] = `
       <Portal
         containerInfo={
           <div
+            aria-hidden="true"
             class="euiOverlayMask euiOverlayMask--aboveHeader"
-          >
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="1"
-            />
-            <div
-              data-focus-lock-disabled="false"
-            >
-              <div
-                class="euiModal modal-manage-email"
-                style="max-width: 1000px;"
-                tabindex="0"
-              >
-                <button
-                  aria-label="Closes this modal window"
-                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                  type="button"
-                >
-                  <div>
-                    EuiIconMock
-                  </div>
-                </button>
-                <div
-                  class="euiModal__flex"
-                >
-                  <div
-                    class="euiModalHeader"
-                  >
-                    <div
-                      class="euiModalHeader__title"
-                    >
-                      Manage email groups
-                    </div>
-                  </div>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                  />
-                  <div
-                    class="euiModalBody"
-                  >
-                    <div
-                      class="euiModalBody__overflow"
-                    >
-                      <div
-                        style="display: flex; justify-content: center;"
-                      >
-                        Email is disallowed
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-          </div>
+            data-aria-hidden="true"
+          />
         }
       >
         <EuiModal
@@ -106,238 +38,155 @@ exports[`ManageEmailGroups renders when email is disallowed 1`] = `
           maxWidth={1000}
           onClose={[Function]}
         >
-          <EuiFocusTrap>
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
-            >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
-              >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
-                  }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  lockProps={
-                    Object {
-                      "allowPinchZoom": undefined,
-                      "as": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
-                      "style": undefined,
-                    }
-                  }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
+          <EuiOverlayMask>
+            <Portal
+              containerInfo={
+                <div
+                  class="euiOverlayMask euiOverlayMask--aboveHeader"
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
                   />
                   <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={1}
-                  />
-                  <RequireSideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
+                    data-focus-lock-disabled="false"
+                  >
+                    <div
+                      class="euiModal modal-manage-email"
+                      style="max-width: 1000px;"
+                      tabindex="0"
+                    >
+                      <button
+                        aria-label="Closes this modal window"
+                        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                        type="button"
+                      >
+                        <div>
+                          EuiIconMock
+                        </div>
+                      </button>
                       <div
-                        data-focus-lock-disabled="false"
+                        class="euiModal__flex"
                       >
                         <div
-                          class="euiModal modal-manage-email"
-                          style="max-width: 1000px;"
-                          tabindex="0"
+                          class="euiModalHeader"
                         >
-                          <button
-                            aria-label="Closes this modal window"
-                            class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            type="button"
-                          >
-                            <div>
-                              EuiIconMock
-                            </div>
-                          </button>
                           <div
-                            class="euiModal__flex"
+                            class="euiModalHeader__title"
                           >
-                            <div
-                              class="euiModalHeader"
-                            >
-                              <div
-                                class="euiModalHeader__title"
-                              >
-                                Manage email groups
-                              </div>
-                            </div>
-                            <hr
-                              class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                            <div
-                              class="euiModalBody"
-                            >
-                              <div
-                                class="euiModalBody__overflow"
-                              >
-                                <div
-                                  style="display: flex; justify-content: center;"
-                                >
-                                  Email is disallowed
-                                </div>
-                              </div>
-                            </div>
+                            Manage email groups
                           </div>
                         </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideCar
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
+                        <hr
+                          class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                        />
                         <div
-                          data-focus-lock-disabled="false"
+                          class="euiModalBody"
                         >
                           <div
-                            class="euiModal modal-manage-email"
-                            style="max-width: 1000px;"
-                            tabindex="0"
+                            class="euiModalBody__overflow"
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                              type="button"
-                            >
-                              <div>
-                                EuiIconMock
-                              </div>
-                            </button>
                             <div
-                              class="euiModal__flex"
+                              style="display: flex; justify-content: center;"
                             >
-                              <div
-                                class="euiModalHeader"
-                              >
-                                <div
-                                  class="euiModalHeader__title"
-                                >
-                                  Manage email groups
-                                </div>
-                              </div>
-                              <hr
-                                class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                              />
-                              <div
-                                class="euiModalBody"
-                              >
-                                <div
-                                  class="euiModalBody__overflow"
-                                >
-                                  <div
-                                    style="display: flex; justify-content: center;"
-                                  >
-                                    Email is disallowed
-                                  </div>
-                                </div>
-                              </div>
+                              Email is disallowed
                             </div>
                           </div>
                         </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                      sideCar={
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
+                  />
+                </div>
+              }
+            >
+              <EuiFocusTrap
+                clickOutsideDisables={false}
+                disabled={false}
+                noIsolation={true}
+                returnFocus={true}
+                scrollLock={false}
+              >
+                <ForwardRef
+                  enabled={true}
+                  noIsolation={true}
+                  onClickOutside={[Function]}
+                  returnFocus={true}
+                  scrollLock={false}
+                >
+                  <ForwardRef
+                    enabled={true}
+                    noIsolation={true}
+                    onClickOutside={[Function]}
+                    returnFocus={true}
+                    scrollLock={false}
+                    sideCar={[Function]}
+                  >
+                    <ForwardRef(FocusLockUI)
+                      as={
                         Object {
-                          "assignMedium": [Function],
-                          "assignSyncMedium": [Function],
-                          "options": Object {
-                            "async": true,
-                            "ssr": false,
+                          "$$typeof": Symbol(react.forward_ref),
+                          "classNames": Object {
+                            "fullWidth": "width-before-scroll-bar",
+                            "zeroRight": "right-scroll-bar-position",
                           },
-                          "read": [Function],
-                          "useMedium": [Function],
+                          "defaultProps": Object {
+                            "enabled": true,
+                            "inert": false,
+                            "removeScrollBar": true,
+                          },
+                          "render": [Function],
                         }
                       }
+                      autoFocus={true}
+                      crossFrame={true}
+                      disabled={false}
+                      lockProps={
+                        Object {
+                          "allowPinchZoom": undefined,
+                          "as": undefined,
+                          "enabled": false,
+                          "inert": undefined,
+                          "onMouseDown": [Function],
+                          "onTouchStart": [Function],
+                          "shards": undefined,
+                          "sideCar": [Function],
+                          "style": undefined,
+                        }
+                      }
+                      noFocusGuards={false}
+                      onActivation={[Function]}
+                      onDeactivation={[Function]}
+                      persistentFocus={false}
+                      returnFocus={true}
+                      sideCar={[Function]}
                     >
-                      <SideEffect(FocusWatcher)
+                      <div
+                        data-focus-guard={true}
+                        key="guard-first"
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                      <RequireSideCar
                         autoFocus={true}
                         crossFrame={true}
                         disabled={false}
@@ -353,7 +202,7 @@ exports[`ManageEmailGroups renders when email is disallowed 1`] = `
                             >
                               <button
                                 aria-label="Closes this modal window"
-                                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                 type="button"
                               >
                                 <div>
@@ -397,8 +246,20 @@ exports[`ManageEmailGroups renders when email is disallowed 1`] = `
                         persistentFocus={false}
                         returnFocus={[Function]}
                         shards={Array []}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
                       >
-                        <FocusWatcher
+                        <SideCar
                           autoFocus={true}
                           crossFrame={true}
                           disabled={false}
@@ -414,7 +275,7 @@ exports[`ManageEmailGroups renders when email is disallowed 1`] = `
                               >
                                 <button
                                   aria-label="Closes this modal window"
-                                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                  class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                   type="button"
                                 >
                                   <div>
@@ -458,238 +319,378 @@ exports[`ManageEmailGroups renders when email is disallowed 1`] = `
                           persistentFocus={false}
                           returnFocus={[Function]}
                           shards={Array []}
-                        />
-                      </SideEffect(FocusWatcher)>
-                    </SideCar>
-                  </RequireSideCar>
-                  <ForwardRef
-                    data-focus-lock-disabled={false}
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
-                  >
-                    <div
-                      data-focus-lock-disabled={false}
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
-                    >
-                      <div
-                        className="euiModal modal-manage-email"
-                        onKeyDown={[Function]}
-                        style={
-                          Object {
-                            "maxWidth": "1000px",
+                          sideCar={
+                            Object {
+                              "assignMedium": [Function],
+                              "assignSyncMedium": [Function],
+                              "options": Object {
+                                "async": true,
+                                "ssr": false,
+                              },
+                              "read": [Function],
+                              "useMedium": [Function],
+                            }
                           }
-                        }
-                        tabIndex={0}
-                      >
-                        <EuiI18n
-                          default="Closes this modal window"
-                          token="euiModal.closeModal"
                         >
-                          <EuiButtonIcon
-                            aria-label="Closes this modal window"
-                            className="euiModal__closeIcon"
-                            color="text"
-                            iconType="cross"
-                            onClick={[Function]}
+                          <SideEffect(FocusWatcher)
+                            autoFocus={true}
+                            crossFrame={true}
+                            disabled={false}
+                            id={Object {}}
+                            observed={
+                              <div
+                                data-focus-lock-disabled="false"
+                              >
+                                <div
+                                  class="euiModal modal-manage-email"
+                                  style="max-width: 1000px;"
+                                  tabindex="0"
+                                >
+                                  <button
+                                    aria-label="Closes this modal window"
+                                    class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                    type="button"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </button>
+                                  <div
+                                    class="euiModal__flex"
+                                  >
+                                    <div
+                                      class="euiModalHeader"
+                                    >
+                                      <div
+                                        class="euiModalHeader__title"
+                                      >
+                                        Manage email groups
+                                      </div>
+                                    </div>
+                                    <hr
+                                      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                    />
+                                    <div
+                                      class="euiModalBody"
+                                    >
+                                      <div
+                                        class="euiModalBody__overflow"
+                                      >
+                                        <div
+                                          style="display: flex; justify-content: center;"
+                                        >
+                                          Email is disallowed
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                            }
+                            onActivation={[Function]}
+                            onDeactivation={[Function]}
+                            persistentFocus={false}
+                            returnFocus={[Function]}
+                            shards={Array []}
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                            <FocusWatcher
+                              autoFocus={true}
+                              crossFrame={true}
                               disabled={false}
-                              onClick={[Function]}
-                              type="button"
-                            >
-                              <EuiIcon
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                size="m"
-                                type="cross"
-                              >
-                                <div>
-                                  EuiIconMock
+                              id={Object {}}
+                              observed={
+                                <div
+                                  data-focus-lock-disabled="false"
+                                >
+                                  <div
+                                    class="euiModal modal-manage-email"
+                                    style="max-width: 1000px;"
+                                    tabindex="0"
+                                  >
+                                    <button
+                                      aria-label="Closes this modal window"
+                                      class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                      type="button"
+                                    >
+                                      <div>
+                                        EuiIconMock
+                                      </div>
+                                    </button>
+                                    <div
+                                      class="euiModal__flex"
+                                    >
+                                      <div
+                                        class="euiModalHeader"
+                                      >
+                                        <div
+                                          class="euiModalHeader__title"
+                                        >
+                                          Manage email groups
+                                        </div>
+                                      </div>
+                                      <hr
+                                        class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                      />
+                                      <div
+                                        class="euiModalBody"
+                                      >
+                                        <div
+                                          class="euiModalBody__overflow"
+                                        >
+                                          <div
+                                            style="display: flex; justify-content: center;"
+                                          >
+                                            Email is disallowed
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
                                 </div>
-                              </EuiIcon>
-                            </button>
-                          </EuiButtonIcon>
-                        </EuiI18n>
+                              }
+                              onActivation={[Function]}
+                              onDeactivation={[Function]}
+                              persistentFocus={false}
+                              returnFocus={[Function]}
+                              shards={Array []}
+                            />
+                          </SideEffect(FocusWatcher)>
+                        </SideCar>
+                      </RequireSideCar>
+                      <ForwardRef
+                        data-focus-lock-disabled={false}
+                        enabled={false}
+                        inert={false}
+                        onBlur={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onTouchStart={[Function]}
+                        removeScrollBar={true}
+                        sideCar={[Function]}
+                      >
                         <div
-                          className="euiModal__flex"
+                          data-focus-lock-disabled={false}
+                          onBlur={[Function]}
+                          onFocus={[Function]}
+                          onMouseDown={[Function]}
+                          onScrollCapture={[Function]}
+                          onTouchMoveCapture={[Function]}
+                          onTouchStart={[Function]}
+                          onWheelCapture={[Function]}
                         >
-                          <EuiModalHeader>
+                          <div
+                            className="euiModal modal-manage-email"
+                            onKeyDown={[Function]}
+                            style={
+                              Object {
+                                "maxWidth": "1000px",
+                              }
+                            }
+                            tabIndex={0}
+                          >
+                            <EuiI18n
+                              default="Closes this modal window"
+                              token="euiModal.closeModal"
+                            >
+                              <EuiButtonIcon
+                                aria-label="Closes this modal window"
+                                className="euiModal__closeIcon"
+                                color="text"
+                                iconType="cross"
+                                onClick={[Function]}
+                              >
+                                <button
+                                  aria-label="Closes this modal window"
+                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                  disabled={false}
+                                  onClick={[Function]}
+                                  type="button"
+                                >
+                                  <EuiIcon
+                                    aria-hidden="true"
+                                    className="euiButtonIcon__icon"
+                                    color="inherit"
+                                    size="m"
+                                    type="cross"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </EuiIcon>
+                                </button>
+                              </EuiButtonIcon>
+                            </EuiI18n>
                             <div
-                              className="euiModalHeader"
+                              className="euiModal__flex"
                             >
-                              <EuiModalHeaderTitle>
+                              <EuiModalHeader>
                                 <div
-                                  className="euiModalHeader__title"
+                                  className="euiModalHeader"
                                 >
-                                  Manage email groups
+                                  <EuiModalHeaderTitle>
+                                    <div
+                                      className="euiModalHeader__title"
+                                    >
+                                      Manage email groups
+                                    </div>
+                                  </EuiModalHeaderTitle>
                                 </div>
-                              </EuiModalHeaderTitle>
-                            </div>
-                          </EuiModalHeader>
-                          <EuiHorizontalRule
-                            margin="s"
-                          >
-                            <hr
-                              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                          </EuiHorizontalRule>
-                          <EuiModalBody>
-                            <div
-                              className="euiModalBody"
-                            >
-                              <div
-                                className="euiModalBody__overflow"
+                              </EuiModalHeader>
+                              <EuiHorizontalRule
+                                margin="s"
                               >
-                                <FormikConnect(FieldArrayInner)
-                                  name="emailGroups"
-                                  validateOnChange={true}
+                                <hr
+                                  className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                />
+                              </EuiHorizontalRule>
+                              <EuiModalBody>
+                                <div
+                                  className="euiModalBody"
                                 >
-                                  <FieldArrayInner
-                                    formik={
-                                      Object {
-                                        "dirty": false,
-                                        "errors": Object {},
-                                        "getFieldHelpers": [Function],
-                                        "getFieldMeta": [Function],
-                                        "getFieldProps": [Function],
-                                        "handleBlur": [Function],
-                                        "handleChange": [Function],
-                                        "handleReset": [Function],
-                                        "handleSubmit": [Function],
-                                        "initialErrors": Object {},
-                                        "initialStatus": undefined,
-                                        "initialTouched": Object {},
-                                        "initialValues": Object {},
-                                        "isSubmitting": false,
-                                        "isValid": true,
-                                        "isValidating": false,
-                                        "registerField": [Function],
-                                        "resetForm": [Function],
-                                        "setErrors": [Function],
-                                        "setFieldError": [Function],
-                                        "setFieldTouched": [Function],
-                                        "setFieldValue": [Function],
-                                        "setFormikState": [Function],
-                                        "setStatus": [Function],
-                                        "setSubmitting": [Function],
-                                        "setTouched": [Function],
-                                        "setValues": [Function],
-                                        "status": undefined,
-                                        "submitCount": 0,
-                                        "submitForm": [Function],
-                                        "touched": Object {},
-                                        "unregisterField": [Function],
-                                        "validateField": [Function],
-                                        "validateForm": [Function],
-                                        "validateOnBlur": true,
-                                        "validateOnChange": false,
-                                        "validateOnMount": false,
-                                        "values": Object {},
-                                      }
-                                    }
-                                    name="emailGroups"
-                                    validateOnChange={true}
+                                  <div
+                                    className="euiModalBody__overflow"
                                   >
-                                    <div
-                                      style={
-                                        Object {
-                                          "display": "flex",
-                                          "justifyContent": "center",
-                                        }
-                                      }
+                                    <FormikConnect(FieldArrayInner)
+                                      name="emailGroups"
+                                      validateOnChange={true}
                                     >
-                                      Email is disallowed
-                                    </div>
-                                  </FieldArrayInner>
-                                </FormikConnect(FieldArrayInner)>
-                              </div>
+                                      <FieldArrayInner
+                                        formik={
+                                          Object {
+                                            "dirty": false,
+                                            "errors": Object {},
+                                            "getFieldHelpers": [Function],
+                                            "getFieldMeta": [Function],
+                                            "getFieldProps": [Function],
+                                            "handleBlur": [Function],
+                                            "handleChange": [Function],
+                                            "handleReset": [Function],
+                                            "handleSubmit": [Function],
+                                            "initialErrors": Object {},
+                                            "initialStatus": undefined,
+                                            "initialTouched": Object {},
+                                            "initialValues": Object {},
+                                            "isSubmitting": false,
+                                            "isValid": true,
+                                            "isValidating": false,
+                                            "registerField": [Function],
+                                            "resetForm": [Function],
+                                            "setErrors": [Function],
+                                            "setFieldError": [Function],
+                                            "setFieldTouched": [Function],
+                                            "setFieldValue": [Function],
+                                            "setFormikState": [Function],
+                                            "setStatus": [Function],
+                                            "setSubmitting": [Function],
+                                            "setTouched": [Function],
+                                            "setValues": [Function],
+                                            "status": undefined,
+                                            "submitCount": 0,
+                                            "submitForm": [Function],
+                                            "touched": Object {},
+                                            "unregisterField": [Function],
+                                            "validateField": [Function],
+                                            "validateForm": [Function],
+                                            "validateOnBlur": true,
+                                            "validateOnChange": false,
+                                            "validateOnMount": false,
+                                            "values": Object {},
+                                          }
+                                        }
+                                        name="emailGroups"
+                                        validateOnChange={true}
+                                      >
+                                        <div
+                                          style={
+                                            Object {
+                                              "display": "flex",
+                                              "justifyContent": "center",
+                                            }
+                                          }
+                                        >
+                                          Email is disallowed
+                                        </div>
+                                      </FieldArrayInner>
+                                    </FormikConnect(FieldArrayInner)>
+                                  </div>
+                                </div>
+                              </EuiModalBody>
                             </div>
-                          </EuiModalBody>
+                          </div>
                         </div>
-                      </div>
-                    </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <Effect
+                      </ForwardRef>
+                      <div
+                        data-focus-guard={true}
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                    </ForwardRef(FocusLockUI)>
+                    <RequireSideCar
                       noIsolation={true}
+                      onClickOutside={[Function]}
                       setLockProps={[Function]}
+                      sideCar={
+                        Object {
+                          "assignMedium": [Function],
+                          "assignSyncMedium": [Function],
+                          "options": Object {
+                            "async": true,
+                            "ssr": false,
+                          },
+                          "read": [Function],
+                          "useMedium": [Function],
+                        }
+                      }
                     >
-                      <Component>
-                        <Sheet
-                          styles="
+                      <SideCar
+                        noIsolation={true}
+                        onClickOutside={[Function]}
+                        setLockProps={[Function]}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
+                      >
+                        <Effect
+                          noIsolation={true}
+                          onClickOutside={[Function]}
+                          setLockProps={[Function]}
+                        >
+                          <Component>
+                            <Sheet
+                              styles="
  [data-focus-on-hidden] {
    pointer-events: none !important;
  }
 "
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </EuiFocusTrap>
+                            />
+                          </Component>
+                        </Effect>
+                      </SideCar>
+                    </RequireSideCar>
+                  </ForwardRef>
+                </ForwardRef>
+              </EuiFocusTrap>
+            </Portal>
+          </EuiOverlayMask>
         </EuiModal>
       </Portal>
     </EuiOverlayMask>
@@ -699,93 +700,25 @@ exports[`ManageEmailGroups renders when email is disallowed 1`] = `
 
 exports[`ManageEmailGroups renders when visible 1`] = `
 <ManageEmailGroups
-  httpClient={[MockFunction]}
-  isEmailAllowed={true}
-  isVisible={true}
-  onClickCancel={[MockFunction]}
-  onClickSave={[MockFunction]}
->
-  <Formik
-    initialValues={Object {}}
-    onSubmit={[Function]}
-    validateOnChange={false}
-  >
-    <EuiOverlayMask>
-      <Portal
-        containerInfo={
-          <div
-            class="euiOverlayMask euiOverlayMask--aboveHeader"
-          >
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="1"
-            />
-            <div
-              data-focus-lock-disabled="false"
-            >
-              <div
-                class="euiModal modal-manage-email"
-                style="max-width: 1000px;"
-                tabindex="0"
-              >
-                <button
-                  aria-label="Closes this modal window"
-                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                  type="button"
-                >
-                  <div>
-                    EuiIconMock
-                  </div>
-                </button>
-                <div
-                  class="euiModal__flex"
-                >
-                  <div
-                    class="euiModalHeader"
-                  >
-                    <div
-                      class="euiModalHeader__title"
-                    >
-                      Manage email groups
-                    </div>
-                  </div>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                  />
-                  <div
-                    class="euiModalBody"
-                  >
-                    <div
-                      class="euiModalBody__overflow"
-                    >
-                      <div
-                        style="display: flex; justify-content: center;"
-                      >
-                        Loading Email Groups...
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-          </div>
+  httpClient={[MockFunction]}
+  isEmailAllowed={true}
+  isVisible={true}
+  onClickCancel={[MockFunction]}
+  onClickSave={[MockFunction]}
+>
+  <Formik
+    initialValues={Object {}}
+    onSubmit={[Function]}
+    validateOnChange={false}
+  >
+    <EuiOverlayMask>
+      <Portal
+        containerInfo={
+          <div
+            aria-hidden="true"
+            class="euiOverlayMask euiOverlayMask--aboveHeader"
+            data-aria-hidden="true"
+          />
         }
       >
         <EuiModal
@@ -793,238 +726,155 @@ exports[`ManageEmailGroups renders when visible 1`] = `
           maxWidth={1000}
           onClose={[Function]}
         >
-          <EuiFocusTrap>
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
-            >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
-              >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
-                  }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  lockProps={
-                    Object {
-                      "allowPinchZoom": undefined,
-                      "as": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
-                      "style": undefined,
-                    }
-                  }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
+          <EuiOverlayMask>
+            <Portal
+              containerInfo={
+                <div
+                  class="euiOverlayMask euiOverlayMask--aboveHeader"
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
                   />
                   <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={1}
-                  />
-                  <RequireSideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
+                    data-focus-lock-disabled="false"
+                  >
+                    <div
+                      class="euiModal modal-manage-email"
+                      style="max-width: 1000px;"
+                      tabindex="0"
+                    >
+                      <button
+                        aria-label="Closes this modal window"
+                        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                        type="button"
+                      >
+                        <div>
+                          EuiIconMock
+                        </div>
+                      </button>
                       <div
-                        data-focus-lock-disabled="false"
+                        class="euiModal__flex"
                       >
                         <div
-                          class="euiModal modal-manage-email"
-                          style="max-width: 1000px;"
-                          tabindex="0"
+                          class="euiModalHeader"
                         >
-                          <button
-                            aria-label="Closes this modal window"
-                            class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            type="button"
-                          >
-                            <div>
-                              EuiIconMock
-                            </div>
-                          </button>
                           <div
-                            class="euiModal__flex"
+                            class="euiModalHeader__title"
                           >
-                            <div
-                              class="euiModalHeader"
-                            >
-                              <div
-                                class="euiModalHeader__title"
-                              >
-                                Manage email groups
-                              </div>
-                            </div>
-                            <hr
-                              class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                            <div
-                              class="euiModalBody"
-                            >
-                              <div
-                                class="euiModalBody__overflow"
-                              >
-                                <div
-                                  style="display: flex; justify-content: center;"
-                                >
-                                  Loading Email Groups...
-                                </div>
-                              </div>
-                            </div>
+                            Manage email groups
                           </div>
                         </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideCar
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
+                        <hr
+                          class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                        />
                         <div
-                          data-focus-lock-disabled="false"
+                          class="euiModalBody"
                         >
                           <div
-                            class="euiModal modal-manage-email"
-                            style="max-width: 1000px;"
-                            tabindex="0"
+                            class="euiModalBody__overflow"
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                              type="button"
-                            >
-                              <div>
-                                EuiIconMock
-                              </div>
-                            </button>
                             <div
-                              class="euiModal__flex"
+                              style="display: flex; justify-content: center;"
                             >
-                              <div
-                                class="euiModalHeader"
-                              >
-                                <div
-                                  class="euiModalHeader__title"
-                                >
-                                  Manage email groups
-                                </div>
-                              </div>
-                              <hr
-                                class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                              />
-                              <div
-                                class="euiModalBody"
-                              >
-                                <div
-                                  class="euiModalBody__overflow"
-                                >
-                                  <div
-                                    style="display: flex; justify-content: center;"
-                                  >
-                                    Loading Email Groups...
-                                  </div>
-                                </div>
-                              </div>
+                              Loading Email Groups...
                             </div>
                           </div>
                         </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                      sideCar={
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
+                  />
+                </div>
+              }
+            >
+              <EuiFocusTrap
+                clickOutsideDisables={false}
+                disabled={false}
+                noIsolation={true}
+                returnFocus={true}
+                scrollLock={false}
+              >
+                <ForwardRef
+                  enabled={true}
+                  noIsolation={true}
+                  onClickOutside={[Function]}
+                  returnFocus={true}
+                  scrollLock={false}
+                >
+                  <ForwardRef
+                    enabled={true}
+                    noIsolation={true}
+                    onClickOutside={[Function]}
+                    returnFocus={true}
+                    scrollLock={false}
+                    sideCar={[Function]}
+                  >
+                    <ForwardRef(FocusLockUI)
+                      as={
                         Object {
-                          "assignMedium": [Function],
-                          "assignSyncMedium": [Function],
-                          "options": Object {
-                            "async": true,
-                            "ssr": false,
+                          "$$typeof": Symbol(react.forward_ref),
+                          "classNames": Object {
+                            "fullWidth": "width-before-scroll-bar",
+                            "zeroRight": "right-scroll-bar-position",
                           },
-                          "read": [Function],
-                          "useMedium": [Function],
+                          "defaultProps": Object {
+                            "enabled": true,
+                            "inert": false,
+                            "removeScrollBar": true,
+                          },
+                          "render": [Function],
+                        }
+                      }
+                      autoFocus={true}
+                      crossFrame={true}
+                      disabled={false}
+                      lockProps={
+                        Object {
+                          "allowPinchZoom": undefined,
+                          "as": undefined,
+                          "enabled": false,
+                          "inert": undefined,
+                          "onMouseDown": [Function],
+                          "onTouchStart": [Function],
+                          "shards": undefined,
+                          "sideCar": [Function],
+                          "style": undefined,
                         }
                       }
+                      noFocusGuards={false}
+                      onActivation={[Function]}
+                      onDeactivation={[Function]}
+                      persistentFocus={false}
+                      returnFocus={true}
+                      sideCar={[Function]}
                     >
-                      <SideEffect(FocusWatcher)
+                      <div
+                        data-focus-guard={true}
+                        key="guard-first"
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                      <RequireSideCar
                         autoFocus={true}
                         crossFrame={true}
                         disabled={false}
@@ -1040,7 +890,7 @@ exports[`ManageEmailGroups renders when visible 1`] = `
                             >
                               <button
                                 aria-label="Closes this modal window"
-                                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                 type="button"
                               >
                                 <div>
@@ -1084,8 +934,20 @@ exports[`ManageEmailGroups renders when visible 1`] = `
                         persistentFocus={false}
                         returnFocus={[Function]}
                         shards={Array []}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
                       >
-                        <FocusWatcher
+                        <SideCar
                           autoFocus={true}
                           crossFrame={true}
                           disabled={false}
@@ -1101,7 +963,7 @@ exports[`ManageEmailGroups renders when visible 1`] = `
                               >
                                 <button
                                   aria-label="Closes this modal window"
-                                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                  class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                   type="button"
                                 >
                                   <div>
@@ -1145,238 +1007,378 @@ exports[`ManageEmailGroups renders when visible 1`] = `
                           persistentFocus={false}
                           returnFocus={[Function]}
                           shards={Array []}
-                        />
-                      </SideEffect(FocusWatcher)>
-                    </SideCar>
-                  </RequireSideCar>
-                  <ForwardRef
-                    data-focus-lock-disabled={false}
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
-                  >
-                    <div
-                      data-focus-lock-disabled={false}
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
-                    >
-                      <div
-                        className="euiModal modal-manage-email"
-                        onKeyDown={[Function]}
-                        style={
-                          Object {
-                            "maxWidth": "1000px",
+                          sideCar={
+                            Object {
+                              "assignMedium": [Function],
+                              "assignSyncMedium": [Function],
+                              "options": Object {
+                                "async": true,
+                                "ssr": false,
+                              },
+                              "read": [Function],
+                              "useMedium": [Function],
+                            }
                           }
-                        }
-                        tabIndex={0}
-                      >
-                        <EuiI18n
-                          default="Closes this modal window"
-                          token="euiModal.closeModal"
                         >
-                          <EuiButtonIcon
-                            aria-label="Closes this modal window"
-                            className="euiModal__closeIcon"
-                            color="text"
-                            iconType="cross"
-                            onClick={[Function]}
+                          <SideEffect(FocusWatcher)
+                            autoFocus={true}
+                            crossFrame={true}
+                            disabled={false}
+                            id={Object {}}
+                            observed={
+                              <div
+                                data-focus-lock-disabled="false"
+                              >
+                                <div
+                                  class="euiModal modal-manage-email"
+                                  style="max-width: 1000px;"
+                                  tabindex="0"
+                                >
+                                  <button
+                                    aria-label="Closes this modal window"
+                                    class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                    type="button"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </button>
+                                  <div
+                                    class="euiModal__flex"
+                                  >
+                                    <div
+                                      class="euiModalHeader"
+                                    >
+                                      <div
+                                        class="euiModalHeader__title"
+                                      >
+                                        Manage email groups
+                                      </div>
+                                    </div>
+                                    <hr
+                                      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                    />
+                                    <div
+                                      class="euiModalBody"
+                                    >
+                                      <div
+                                        class="euiModalBody__overflow"
+                                      >
+                                        <div
+                                          style="display: flex; justify-content: center;"
+                                        >
+                                          Loading Email Groups...
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                            }
+                            onActivation={[Function]}
+                            onDeactivation={[Function]}
+                            persistentFocus={false}
+                            returnFocus={[Function]}
+                            shards={Array []}
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                            <FocusWatcher
+                              autoFocus={true}
+                              crossFrame={true}
                               disabled={false}
-                              onClick={[Function]}
-                              type="button"
-                            >
-                              <EuiIcon
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                size="m"
-                                type="cross"
-                              >
-                                <div>
-                                  EuiIconMock
+                              id={Object {}}
+                              observed={
+                                <div
+                                  data-focus-lock-disabled="false"
+                                >
+                                  <div
+                                    class="euiModal modal-manage-email"
+                                    style="max-width: 1000px;"
+                                    tabindex="0"
+                                  >
+                                    <button
+                                      aria-label="Closes this modal window"
+                                      class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                      type="button"
+                                    >
+                                      <div>
+                                        EuiIconMock
+                                      </div>
+                                    </button>
+                                    <div
+                                      class="euiModal__flex"
+                                    >
+                                      <div
+                                        class="euiModalHeader"
+                                      >
+                                        <div
+                                          class="euiModalHeader__title"
+                                        >
+                                          Manage email groups
+                                        </div>
+                                      </div>
+                                      <hr
+                                        class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                      />
+                                      <div
+                                        class="euiModalBody"
+                                      >
+                                        <div
+                                          class="euiModalBody__overflow"
+                                        >
+                                          <div
+                                            style="display: flex; justify-content: center;"
+                                          >
+                                            Loading Email Groups...
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
                                 </div>
-                              </EuiIcon>
-                            </button>
-                          </EuiButtonIcon>
-                        </EuiI18n>
+                              }
+                              onActivation={[Function]}
+                              onDeactivation={[Function]}
+                              persistentFocus={false}
+                              returnFocus={[Function]}
+                              shards={Array []}
+                            />
+                          </SideEffect(FocusWatcher)>
+                        </SideCar>
+                      </RequireSideCar>
+                      <ForwardRef
+                        data-focus-lock-disabled={false}
+                        enabled={false}
+                        inert={false}
+                        onBlur={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onTouchStart={[Function]}
+                        removeScrollBar={true}
+                        sideCar={[Function]}
+                      >
                         <div
-                          className="euiModal__flex"
+                          data-focus-lock-disabled={false}
+                          onBlur={[Function]}
+                          onFocus={[Function]}
+                          onMouseDown={[Function]}
+                          onScrollCapture={[Function]}
+                          onTouchMoveCapture={[Function]}
+                          onTouchStart={[Function]}
+                          onWheelCapture={[Function]}
                         >
-                          <EuiModalHeader>
+                          <div
+                            className="euiModal modal-manage-email"
+                            onKeyDown={[Function]}
+                            style={
+                              Object {
+                                "maxWidth": "1000px",
+                              }
+                            }
+                            tabIndex={0}
+                          >
+                            <EuiI18n
+                              default="Closes this modal window"
+                              token="euiModal.closeModal"
+                            >
+                              <EuiButtonIcon
+                                aria-label="Closes this modal window"
+                                className="euiModal__closeIcon"
+                                color="text"
+                                iconType="cross"
+                                onClick={[Function]}
+                              >
+                                <button
+                                  aria-label="Closes this modal window"
+                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                  disabled={false}
+                                  onClick={[Function]}
+                                  type="button"
+                                >
+                                  <EuiIcon
+                                    aria-hidden="true"
+                                    className="euiButtonIcon__icon"
+                                    color="inherit"
+                                    size="m"
+                                    type="cross"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </EuiIcon>
+                                </button>
+                              </EuiButtonIcon>
+                            </EuiI18n>
                             <div
-                              className="euiModalHeader"
+                              className="euiModal__flex"
                             >
-                              <EuiModalHeaderTitle>
+                              <EuiModalHeader>
                                 <div
-                                  className="euiModalHeader__title"
+                                  className="euiModalHeader"
                                 >
-                                  Manage email groups
+                                  <EuiModalHeaderTitle>
+                                    <div
+                                      className="euiModalHeader__title"
+                                    >
+                                      Manage email groups
+                                    </div>
+                                  </EuiModalHeaderTitle>
                                 </div>
-                              </EuiModalHeaderTitle>
-                            </div>
-                          </EuiModalHeader>
-                          <EuiHorizontalRule
-                            margin="s"
-                          >
-                            <hr
-                              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                          </EuiHorizontalRule>
-                          <EuiModalBody>
-                            <div
-                              className="euiModalBody"
-                            >
-                              <div
-                                className="euiModalBody__overflow"
+                              </EuiModalHeader>
+                              <EuiHorizontalRule
+                                margin="s"
                               >
-                                <FormikConnect(FieldArrayInner)
-                                  name="emailGroups"
-                                  validateOnChange={true}
+                                <hr
+                                  className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                />
+                              </EuiHorizontalRule>
+                              <EuiModalBody>
+                                <div
+                                  className="euiModalBody"
                                 >
-                                  <FieldArrayInner
-                                    formik={
-                                      Object {
-                                        "dirty": false,
-                                        "errors": Object {},
-                                        "getFieldHelpers": [Function],
-                                        "getFieldMeta": [Function],
-                                        "getFieldProps": [Function],
-                                        "handleBlur": [Function],
-                                        "handleChange": [Function],
-                                        "handleReset": [Function],
-                                        "handleSubmit": [Function],
-                                        "initialErrors": Object {},
-                                        "initialStatus": undefined,
-                                        "initialTouched": Object {},
-                                        "initialValues": Object {},
-                                        "isSubmitting": false,
-                                        "isValid": true,
-                                        "isValidating": false,
-                                        "registerField": [Function],
-                                        "resetForm": [Function],
-                                        "setErrors": [Function],
-                                        "setFieldError": [Function],
-                                        "setFieldTouched": [Function],
-                                        "setFieldValue": [Function],
-                                        "setFormikState": [Function],
-                                        "setStatus": [Function],
-                                        "setSubmitting": [Function],
-                                        "setTouched": [Function],
-                                        "setValues": [Function],
-                                        "status": undefined,
-                                        "submitCount": 0,
-                                        "submitForm": [Function],
-                                        "touched": Object {},
-                                        "unregisterField": [Function],
-                                        "validateField": [Function],
-                                        "validateForm": [Function],
-                                        "validateOnBlur": true,
-                                        "validateOnChange": false,
-                                        "validateOnMount": false,
-                                        "values": Object {},
-                                      }
-                                    }
-                                    name="emailGroups"
-                                    validateOnChange={true}
+                                  <div
+                                    className="euiModalBody__overflow"
                                   >
-                                    <div
-                                      style={
-                                        Object {
-                                          "display": "flex",
-                                          "justifyContent": "center",
-                                        }
-                                      }
+                                    <FormikConnect(FieldArrayInner)
+                                      name="emailGroups"
+                                      validateOnChange={true}
                                     >
-                                      Loading Email Groups...
-                                    </div>
-                                  </FieldArrayInner>
-                                </FormikConnect(FieldArrayInner)>
-                              </div>
+                                      <FieldArrayInner
+                                        formik={
+                                          Object {
+                                            "dirty": false,
+                                            "errors": Object {},
+                                            "getFieldHelpers": [Function],
+                                            "getFieldMeta": [Function],
+                                            "getFieldProps": [Function],
+                                            "handleBlur": [Function],
+                                            "handleChange": [Function],
+                                            "handleReset": [Function],
+                                            "handleSubmit": [Function],
+                                            "initialErrors": Object {},
+                                            "initialStatus": undefined,
+                                            "initialTouched": Object {},
+                                            "initialValues": Object {},
+                                            "isSubmitting": false,
+                                            "isValid": true,
+                                            "isValidating": false,
+                                            "registerField": [Function],
+                                            "resetForm": [Function],
+                                            "setErrors": [Function],
+                                            "setFieldError": [Function],
+                                            "setFieldTouched": [Function],
+                                            "setFieldValue": [Function],
+                                            "setFormikState": [Function],
+                                            "setStatus": [Function],
+                                            "setSubmitting": [Function],
+                                            "setTouched": [Function],
+                                            "setValues": [Function],
+                                            "status": undefined,
+                                            "submitCount": 0,
+                                            "submitForm": [Function],
+                                            "touched": Object {},
+                                            "unregisterField": [Function],
+                                            "validateField": [Function],
+                                            "validateForm": [Function],
+                                            "validateOnBlur": true,
+                                            "validateOnChange": false,
+                                            "validateOnMount": false,
+                                            "values": Object {},
+                                          }
+                                        }
+                                        name="emailGroups"
+                                        validateOnChange={true}
+                                      >
+                                        <div
+                                          style={
+                                            Object {
+                                              "display": "flex",
+                                              "justifyContent": "center",
+                                            }
+                                          }
+                                        >
+                                          Loading Email Groups...
+                                        </div>
+                                      </FieldArrayInner>
+                                    </FormikConnect(FieldArrayInner)>
+                                  </div>
+                                </div>
+                              </EuiModalBody>
                             </div>
-                          </EuiModalBody>
+                          </div>
                         </div>
-                      </div>
-                    </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <Effect
+                      </ForwardRef>
+                      <div
+                        data-focus-guard={true}
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                    </ForwardRef(FocusLockUI)>
+                    <RequireSideCar
                       noIsolation={true}
+                      onClickOutside={[Function]}
                       setLockProps={[Function]}
+                      sideCar={
+                        Object {
+                          "assignMedium": [Function],
+                          "assignSyncMedium": [Function],
+                          "options": Object {
+                            "async": true,
+                            "ssr": false,
+                          },
+                          "read": [Function],
+                          "useMedium": [Function],
+                        }
+                      }
                     >
-                      <Component>
-                        <Sheet
-                          styles="
+                      <SideCar
+                        noIsolation={true}
+                        onClickOutside={[Function]}
+                        setLockProps={[Function]}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
+                      >
+                        <Effect
+                          noIsolation={true}
+                          onClickOutside={[Function]}
+                          setLockProps={[Function]}
+                        >
+                          <Component>
+                            <Sheet
+                              styles="
  [data-focus-on-hidden] {
    pointer-events: none !important;
  }
 "
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </EuiFocusTrap>
+                            />
+                          </Component>
+                        </Effect>
+                      </SideCar>
+                    </RequireSideCar>
+                  </ForwardRef>
+                </ForwardRef>
+              </EuiFocusTrap>
+            </Portal>
+          </EuiOverlayMask>
         </EuiModal>
       </Portal>
     </EuiOverlayMask>
diff --git a/public/pages/Destinations/containers/CreateDestination/ManageSenders/__snapshots__/ManageSenders.test.js.snap b/public/pages/Destinations/containers/CreateDestination/ManageSenders/__snapshots__/ManageSenders.test.js.snap
index a929732a5..afeee5e08 100644
--- a/public/pages/Destinations/containers/CreateDestination/ManageSenders/__snapshots__/ManageSenders.test.js.snap
+++ b/public/pages/Destinations/containers/CreateDestination/ManageSenders/__snapshots__/ManageSenders.test.js.snap
@@ -27,78 +27,10 @@ exports[`ManageSenders renders when email is disallowed 1`] = `
       <Portal
         containerInfo={
           <div
+            aria-hidden="true"
             class="euiOverlayMask euiOverlayMask--aboveHeader"
-          >
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="1"
-            />
-            <div
-              data-focus-lock-disabled="false"
-            >
-              <div
-                class="euiModal modal-manage-email"
-                style="max-width: 1000px;"
-                tabindex="0"
-              >
-                <button
-                  aria-label="Closes this modal window"
-                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                  type="button"
-                >
-                  <div>
-                    EuiIconMock
-                  </div>
-                </button>
-                <div
-                  class="euiModal__flex"
-                >
-                  <div
-                    class="euiModalHeader"
-                  >
-                    <div
-                      class="euiModalHeader__title"
-                    >
-                      Manage email senders
-                    </div>
-                  </div>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                  />
-                  <div
-                    class="euiModalBody"
-                  >
-                    <div
-                      class="euiModalBody__overflow"
-                    >
-                      <div
-                        style="display: flex; justify-content: center;"
-                      >
-                        Email is disallowed
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-          </div>
+            data-aria-hidden="true"
+          />
         }
       >
         <EuiModal
@@ -106,238 +38,155 @@ exports[`ManageSenders renders when email is disallowed 1`] = `
           maxWidth={1000}
           onClose={[Function]}
         >
-          <EuiFocusTrap>
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
-            >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
-              >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
-                  }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  lockProps={
-                    Object {
-                      "allowPinchZoom": undefined,
-                      "as": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
-                      "style": undefined,
-                    }
-                  }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
+          <EuiOverlayMask>
+            <Portal
+              containerInfo={
+                <div
+                  class="euiOverlayMask euiOverlayMask--aboveHeader"
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
                   />
                   <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={1}
-                  />
-                  <RequireSideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
+                    data-focus-lock-disabled="false"
+                  >
+                    <div
+                      class="euiModal modal-manage-email"
+                      style="max-width: 1000px;"
+                      tabindex="0"
+                    >
+                      <button
+                        aria-label="Closes this modal window"
+                        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                        type="button"
+                      >
+                        <div>
+                          EuiIconMock
+                        </div>
+                      </button>
                       <div
-                        data-focus-lock-disabled="false"
+                        class="euiModal__flex"
                       >
                         <div
-                          class="euiModal modal-manage-email"
-                          style="max-width: 1000px;"
-                          tabindex="0"
+                          class="euiModalHeader"
                         >
-                          <button
-                            aria-label="Closes this modal window"
-                            class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            type="button"
-                          >
-                            <div>
-                              EuiIconMock
-                            </div>
-                          </button>
                           <div
-                            class="euiModal__flex"
+                            class="euiModalHeader__title"
                           >
-                            <div
-                              class="euiModalHeader"
-                            >
-                              <div
-                                class="euiModalHeader__title"
-                              >
-                                Manage email senders
-                              </div>
-                            </div>
-                            <hr
-                              class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                            <div
-                              class="euiModalBody"
-                            >
-                              <div
-                                class="euiModalBody__overflow"
-                              >
-                                <div
-                                  style="display: flex; justify-content: center;"
-                                >
-                                  Email is disallowed
-                                </div>
-                              </div>
-                            </div>
+                            Manage email senders
                           </div>
                         </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideCar
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
+                        <hr
+                          class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                        />
                         <div
-                          data-focus-lock-disabled="false"
+                          class="euiModalBody"
                         >
                           <div
-                            class="euiModal modal-manage-email"
-                            style="max-width: 1000px;"
-                            tabindex="0"
+                            class="euiModalBody__overflow"
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                              type="button"
-                            >
-                              <div>
-                                EuiIconMock
-                              </div>
-                            </button>
                             <div
-                              class="euiModal__flex"
+                              style="display: flex; justify-content: center;"
                             >
-                              <div
-                                class="euiModalHeader"
-                              >
-                                <div
-                                  class="euiModalHeader__title"
-                                >
-                                  Manage email senders
-                                </div>
-                              </div>
-                              <hr
-                                class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                              />
-                              <div
-                                class="euiModalBody"
-                              >
-                                <div
-                                  class="euiModalBody__overflow"
-                                >
-                                  <div
-                                    style="display: flex; justify-content: center;"
-                                  >
-                                    Email is disallowed
-                                  </div>
-                                </div>
-                              </div>
+                              Email is disallowed
                             </div>
                           </div>
                         </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                      sideCar={
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
+                  />
+                </div>
+              }
+            >
+              <EuiFocusTrap
+                clickOutsideDisables={false}
+                disabled={false}
+                noIsolation={true}
+                returnFocus={true}
+                scrollLock={false}
+              >
+                <ForwardRef
+                  enabled={true}
+                  noIsolation={true}
+                  onClickOutside={[Function]}
+                  returnFocus={true}
+                  scrollLock={false}
+                >
+                  <ForwardRef
+                    enabled={true}
+                    noIsolation={true}
+                    onClickOutside={[Function]}
+                    returnFocus={true}
+                    scrollLock={false}
+                    sideCar={[Function]}
+                  >
+                    <ForwardRef(FocusLockUI)
+                      as={
                         Object {
-                          "assignMedium": [Function],
-                          "assignSyncMedium": [Function],
-                          "options": Object {
-                            "async": true,
-                            "ssr": false,
+                          "$$typeof": Symbol(react.forward_ref),
+                          "classNames": Object {
+                            "fullWidth": "width-before-scroll-bar",
+                            "zeroRight": "right-scroll-bar-position",
                           },
-                          "read": [Function],
-                          "useMedium": [Function],
+                          "defaultProps": Object {
+                            "enabled": true,
+                            "inert": false,
+                            "removeScrollBar": true,
+                          },
+                          "render": [Function],
                         }
                       }
+                      autoFocus={true}
+                      crossFrame={true}
+                      disabled={false}
+                      lockProps={
+                        Object {
+                          "allowPinchZoom": undefined,
+                          "as": undefined,
+                          "enabled": false,
+                          "inert": undefined,
+                          "onMouseDown": [Function],
+                          "onTouchStart": [Function],
+                          "shards": undefined,
+                          "sideCar": [Function],
+                          "style": undefined,
+                        }
+                      }
+                      noFocusGuards={false}
+                      onActivation={[Function]}
+                      onDeactivation={[Function]}
+                      persistentFocus={false}
+                      returnFocus={true}
+                      sideCar={[Function]}
                     >
-                      <SideEffect(FocusWatcher)
+                      <div
+                        data-focus-guard={true}
+                        key="guard-first"
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                      <RequireSideCar
                         autoFocus={true}
                         crossFrame={true}
                         disabled={false}
@@ -353,7 +202,7 @@ exports[`ManageSenders renders when email is disallowed 1`] = `
                             >
                               <button
                                 aria-label="Closes this modal window"
-                                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                 type="button"
                               >
                                 <div>
@@ -397,8 +246,20 @@ exports[`ManageSenders renders when email is disallowed 1`] = `
                         persistentFocus={false}
                         returnFocus={[Function]}
                         shards={Array []}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
                       >
-                        <FocusWatcher
+                        <SideCar
                           autoFocus={true}
                           crossFrame={true}
                           disabled={false}
@@ -414,7 +275,7 @@ exports[`ManageSenders renders when email is disallowed 1`] = `
                               >
                                 <button
                                   aria-label="Closes this modal window"
-                                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                  class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                   type="button"
                                 >
                                   <div>
@@ -458,238 +319,378 @@ exports[`ManageSenders renders when email is disallowed 1`] = `
                           persistentFocus={false}
                           returnFocus={[Function]}
                           shards={Array []}
-                        />
-                      </SideEffect(FocusWatcher)>
-                    </SideCar>
-                  </RequireSideCar>
-                  <ForwardRef
-                    data-focus-lock-disabled={false}
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
-                  >
-                    <div
-                      data-focus-lock-disabled={false}
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
-                    >
-                      <div
-                        className="euiModal modal-manage-email"
-                        onKeyDown={[Function]}
-                        style={
-                          Object {
-                            "maxWidth": "1000px",
+                          sideCar={
+                            Object {
+                              "assignMedium": [Function],
+                              "assignSyncMedium": [Function],
+                              "options": Object {
+                                "async": true,
+                                "ssr": false,
+                              },
+                              "read": [Function],
+                              "useMedium": [Function],
+                            }
                           }
-                        }
-                        tabIndex={0}
-                      >
-                        <EuiI18n
-                          default="Closes this modal window"
-                          token="euiModal.closeModal"
                         >
-                          <EuiButtonIcon
-                            aria-label="Closes this modal window"
-                            className="euiModal__closeIcon"
-                            color="text"
-                            iconType="cross"
-                            onClick={[Function]}
+                          <SideEffect(FocusWatcher)
+                            autoFocus={true}
+                            crossFrame={true}
+                            disabled={false}
+                            id={Object {}}
+                            observed={
+                              <div
+                                data-focus-lock-disabled="false"
+                              >
+                                <div
+                                  class="euiModal modal-manage-email"
+                                  style="max-width: 1000px;"
+                                  tabindex="0"
+                                >
+                                  <button
+                                    aria-label="Closes this modal window"
+                                    class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                    type="button"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </button>
+                                  <div
+                                    class="euiModal__flex"
+                                  >
+                                    <div
+                                      class="euiModalHeader"
+                                    >
+                                      <div
+                                        class="euiModalHeader__title"
+                                      >
+                                        Manage email senders
+                                      </div>
+                                    </div>
+                                    <hr
+                                      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                    />
+                                    <div
+                                      class="euiModalBody"
+                                    >
+                                      <div
+                                        class="euiModalBody__overflow"
+                                      >
+                                        <div
+                                          style="display: flex; justify-content: center;"
+                                        >
+                                          Email is disallowed
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                            }
+                            onActivation={[Function]}
+                            onDeactivation={[Function]}
+                            persistentFocus={false}
+                            returnFocus={[Function]}
+                            shards={Array []}
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                            <FocusWatcher
+                              autoFocus={true}
+                              crossFrame={true}
                               disabled={false}
-                              onClick={[Function]}
-                              type="button"
-                            >
-                              <EuiIcon
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                size="m"
-                                type="cross"
-                              >
-                                <div>
-                                  EuiIconMock
+                              id={Object {}}
+                              observed={
+                                <div
+                                  data-focus-lock-disabled="false"
+                                >
+                                  <div
+                                    class="euiModal modal-manage-email"
+                                    style="max-width: 1000px;"
+                                    tabindex="0"
+                                  >
+                                    <button
+                                      aria-label="Closes this modal window"
+                                      class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                      type="button"
+                                    >
+                                      <div>
+                                        EuiIconMock
+                                      </div>
+                                    </button>
+                                    <div
+                                      class="euiModal__flex"
+                                    >
+                                      <div
+                                        class="euiModalHeader"
+                                      >
+                                        <div
+                                          class="euiModalHeader__title"
+                                        >
+                                          Manage email senders
+                                        </div>
+                                      </div>
+                                      <hr
+                                        class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                      />
+                                      <div
+                                        class="euiModalBody"
+                                      >
+                                        <div
+                                          class="euiModalBody__overflow"
+                                        >
+                                          <div
+                                            style="display: flex; justify-content: center;"
+                                          >
+                                            Email is disallowed
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
                                 </div>
-                              </EuiIcon>
-                            </button>
-                          </EuiButtonIcon>
-                        </EuiI18n>
+                              }
+                              onActivation={[Function]}
+                              onDeactivation={[Function]}
+                              persistentFocus={false}
+                              returnFocus={[Function]}
+                              shards={Array []}
+                            />
+                          </SideEffect(FocusWatcher)>
+                        </SideCar>
+                      </RequireSideCar>
+                      <ForwardRef
+                        data-focus-lock-disabled={false}
+                        enabled={false}
+                        inert={false}
+                        onBlur={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onTouchStart={[Function]}
+                        removeScrollBar={true}
+                        sideCar={[Function]}
+                      >
                         <div
-                          className="euiModal__flex"
+                          data-focus-lock-disabled={false}
+                          onBlur={[Function]}
+                          onFocus={[Function]}
+                          onMouseDown={[Function]}
+                          onScrollCapture={[Function]}
+                          onTouchMoveCapture={[Function]}
+                          onTouchStart={[Function]}
+                          onWheelCapture={[Function]}
                         >
-                          <EuiModalHeader>
+                          <div
+                            className="euiModal modal-manage-email"
+                            onKeyDown={[Function]}
+                            style={
+                              Object {
+                                "maxWidth": "1000px",
+                              }
+                            }
+                            tabIndex={0}
+                          >
+                            <EuiI18n
+                              default="Closes this modal window"
+                              token="euiModal.closeModal"
+                            >
+                              <EuiButtonIcon
+                                aria-label="Closes this modal window"
+                                className="euiModal__closeIcon"
+                                color="text"
+                                iconType="cross"
+                                onClick={[Function]}
+                              >
+                                <button
+                                  aria-label="Closes this modal window"
+                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                  disabled={false}
+                                  onClick={[Function]}
+                                  type="button"
+                                >
+                                  <EuiIcon
+                                    aria-hidden="true"
+                                    className="euiButtonIcon__icon"
+                                    color="inherit"
+                                    size="m"
+                                    type="cross"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </EuiIcon>
+                                </button>
+                              </EuiButtonIcon>
+                            </EuiI18n>
                             <div
-                              className="euiModalHeader"
+                              className="euiModal__flex"
                             >
-                              <EuiModalHeaderTitle>
+                              <EuiModalHeader>
                                 <div
-                                  className="euiModalHeader__title"
+                                  className="euiModalHeader"
                                 >
-                                  Manage email senders
+                                  <EuiModalHeaderTitle>
+                                    <div
+                                      className="euiModalHeader__title"
+                                    >
+                                      Manage email senders
+                                    </div>
+                                  </EuiModalHeaderTitle>
                                 </div>
-                              </EuiModalHeaderTitle>
-                            </div>
-                          </EuiModalHeader>
-                          <EuiHorizontalRule
-                            margin="s"
-                          >
-                            <hr
-                              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                          </EuiHorizontalRule>
-                          <EuiModalBody>
-                            <div
-                              className="euiModalBody"
-                            >
-                              <div
-                                className="euiModalBody__overflow"
+                              </EuiModalHeader>
+                              <EuiHorizontalRule
+                                margin="s"
                               >
-                                <FormikConnect(FieldArrayInner)
-                                  name="senders"
-                                  validateOnChange={true}
+                                <hr
+                                  className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                />
+                              </EuiHorizontalRule>
+                              <EuiModalBody>
+                                <div
+                                  className="euiModalBody"
                                 >
-                                  <FieldArrayInner
-                                    formik={
-                                      Object {
-                                        "dirty": false,
-                                        "errors": Object {},
-                                        "getFieldHelpers": [Function],
-                                        "getFieldMeta": [Function],
-                                        "getFieldProps": [Function],
-                                        "handleBlur": [Function],
-                                        "handleChange": [Function],
-                                        "handleReset": [Function],
-                                        "handleSubmit": [Function],
-                                        "initialErrors": Object {},
-                                        "initialStatus": undefined,
-                                        "initialTouched": Object {},
-                                        "initialValues": Object {},
-                                        "isSubmitting": false,
-                                        "isValid": true,
-                                        "isValidating": false,
-                                        "registerField": [Function],
-                                        "resetForm": [Function],
-                                        "setErrors": [Function],
-                                        "setFieldError": [Function],
-                                        "setFieldTouched": [Function],
-                                        "setFieldValue": [Function],
-                                        "setFormikState": [Function],
-                                        "setStatus": [Function],
-                                        "setSubmitting": [Function],
-                                        "setTouched": [Function],
-                                        "setValues": [Function],
-                                        "status": undefined,
-                                        "submitCount": 0,
-                                        "submitForm": [Function],
-                                        "touched": Object {},
-                                        "unregisterField": [Function],
-                                        "validateField": [Function],
-                                        "validateForm": [Function],
-                                        "validateOnBlur": true,
-                                        "validateOnChange": false,
-                                        "validateOnMount": false,
-                                        "values": Object {},
-                                      }
-                                    }
-                                    name="senders"
-                                    validateOnChange={true}
+                                  <div
+                                    className="euiModalBody__overflow"
                                   >
-                                    <div
-                                      style={
-                                        Object {
-                                          "display": "flex",
-                                          "justifyContent": "center",
-                                        }
-                                      }
+                                    <FormikConnect(FieldArrayInner)
+                                      name="senders"
+                                      validateOnChange={true}
                                     >
-                                      Email is disallowed
-                                    </div>
-                                  </FieldArrayInner>
-                                </FormikConnect(FieldArrayInner)>
-                              </div>
+                                      <FieldArrayInner
+                                        formik={
+                                          Object {
+                                            "dirty": false,
+                                            "errors": Object {},
+                                            "getFieldHelpers": [Function],
+                                            "getFieldMeta": [Function],
+                                            "getFieldProps": [Function],
+                                            "handleBlur": [Function],
+                                            "handleChange": [Function],
+                                            "handleReset": [Function],
+                                            "handleSubmit": [Function],
+                                            "initialErrors": Object {},
+                                            "initialStatus": undefined,
+                                            "initialTouched": Object {},
+                                            "initialValues": Object {},
+                                            "isSubmitting": false,
+                                            "isValid": true,
+                                            "isValidating": false,
+                                            "registerField": [Function],
+                                            "resetForm": [Function],
+                                            "setErrors": [Function],
+                                            "setFieldError": [Function],
+                                            "setFieldTouched": [Function],
+                                            "setFieldValue": [Function],
+                                            "setFormikState": [Function],
+                                            "setStatus": [Function],
+                                            "setSubmitting": [Function],
+                                            "setTouched": [Function],
+                                            "setValues": [Function],
+                                            "status": undefined,
+                                            "submitCount": 0,
+                                            "submitForm": [Function],
+                                            "touched": Object {},
+                                            "unregisterField": [Function],
+                                            "validateField": [Function],
+                                            "validateForm": [Function],
+                                            "validateOnBlur": true,
+                                            "validateOnChange": false,
+                                            "validateOnMount": false,
+                                            "values": Object {},
+                                          }
+                                        }
+                                        name="senders"
+                                        validateOnChange={true}
+                                      >
+                                        <div
+                                          style={
+                                            Object {
+                                              "display": "flex",
+                                              "justifyContent": "center",
+                                            }
+                                          }
+                                        >
+                                          Email is disallowed
+                                        </div>
+                                      </FieldArrayInner>
+                                    </FormikConnect(FieldArrayInner)>
+                                  </div>
+                                </div>
+                              </EuiModalBody>
                             </div>
-                          </EuiModalBody>
+                          </div>
                         </div>
-                      </div>
-                    </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <Effect
+                      </ForwardRef>
+                      <div
+                        data-focus-guard={true}
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                    </ForwardRef(FocusLockUI)>
+                    <RequireSideCar
                       noIsolation={true}
+                      onClickOutside={[Function]}
                       setLockProps={[Function]}
+                      sideCar={
+                        Object {
+                          "assignMedium": [Function],
+                          "assignSyncMedium": [Function],
+                          "options": Object {
+                            "async": true,
+                            "ssr": false,
+                          },
+                          "read": [Function],
+                          "useMedium": [Function],
+                        }
+                      }
                     >
-                      <Component>
-                        <Sheet
-                          styles="
+                      <SideCar
+                        noIsolation={true}
+                        onClickOutside={[Function]}
+                        setLockProps={[Function]}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
+                      >
+                        <Effect
+                          noIsolation={true}
+                          onClickOutside={[Function]}
+                          setLockProps={[Function]}
+                        >
+                          <Component>
+                            <Sheet
+                              styles="
  [data-focus-on-hidden] {
    pointer-events: none !important;
  }
 "
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </EuiFocusTrap>
+                            />
+                          </Component>
+                        </Effect>
+                      </SideCar>
+                    </RequireSideCar>
+                  </ForwardRef>
+                </ForwardRef>
+              </EuiFocusTrap>
+            </Portal>
+          </EuiOverlayMask>
         </EuiModal>
       </Portal>
     </EuiOverlayMask>
@@ -699,93 +700,25 @@ exports[`ManageSenders renders when email is disallowed 1`] = `
 
 exports[`ManageSenders renders when visible 1`] = `
 <ManageSenders
-  httpClient={[MockFunction]}
-  isEmailAllowed={true}
-  isVisible={true}
-  onClickCancel={[MockFunction]}
-  onClickSave={[MockFunction]}
->
-  <Formik
-    initialValues={Object {}}
-    onSubmit={[Function]}
-    validateOnChange={false}
-  >
-    <EuiOverlayMask>
-      <Portal
-        containerInfo={
-          <div
-            class="euiOverlayMask euiOverlayMask--aboveHeader"
-          >
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="1"
-            />
-            <div
-              data-focus-lock-disabled="false"
-            >
-              <div
-                class="euiModal modal-manage-email"
-                style="max-width: 1000px;"
-                tabindex="0"
-              >
-                <button
-                  aria-label="Closes this modal window"
-                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                  type="button"
-                >
-                  <div>
-                    EuiIconMock
-                  </div>
-                </button>
-                <div
-                  class="euiModal__flex"
-                >
-                  <div
-                    class="euiModalHeader"
-                  >
-                    <div
-                      class="euiModalHeader__title"
-                    >
-                      Manage email senders
-                    </div>
-                  </div>
-                  <hr
-                    class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                  />
-                  <div
-                    class="euiModalBody"
-                  >
-                    <div
-                      class="euiModalBody__overflow"
-                    >
-                      <div
-                        style="display: flex; justify-content: center;"
-                      >
-                        Loading Senders...
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              aria-hidden="true"
-              data-aria-hidden="true"
-              data-focus-guard="true"
-              style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-              tabindex="0"
-            />
-          </div>
+  httpClient={[MockFunction]}
+  isEmailAllowed={true}
+  isVisible={true}
+  onClickCancel={[MockFunction]}
+  onClickSave={[MockFunction]}
+>
+  <Formik
+    initialValues={Object {}}
+    onSubmit={[Function]}
+    validateOnChange={false}
+  >
+    <EuiOverlayMask>
+      <Portal
+        containerInfo={
+          <div
+            aria-hidden="true"
+            class="euiOverlayMask euiOverlayMask--aboveHeader"
+            data-aria-hidden="true"
+          />
         }
       >
         <EuiModal
@@ -793,238 +726,155 @@ exports[`ManageSenders renders when visible 1`] = `
           maxWidth={1000}
           onClose={[Function]}
         >
-          <EuiFocusTrap>
-            <ForwardRef
-              enabled={true}
-              noIsolation={true}
-              returnFocus={true}
-              scrollLock={false}
-            >
-              <ForwardRef
-                enabled={true}
-                noIsolation={true}
-                returnFocus={true}
-                scrollLock={false}
-                sideCar={[Function]}
-              >
-                <ForwardRef
-                  as={
-                    Object {
-                      "$$typeof": Symbol(react.forward_ref),
-                      "classNames": Object {
-                        "fullWidth": "width-before-scroll-bar",
-                        "zeroRight": "right-scroll-bar-position",
-                      },
-                      "defaultProps": Object {
-                        "enabled": true,
-                        "inert": false,
-                        "removeScrollBar": true,
-                      },
-                      "render": [Function],
-                    }
-                  }
-                  autoFocus={true}
-                  crossFrame={true}
-                  disabled={false}
-                  lockProps={
-                    Object {
-                      "allowPinchZoom": undefined,
-                      "as": undefined,
-                      "enabled": false,
-                      "inert": undefined,
-                      "onMouseDown": [Function],
-                      "onTouchStart": [Function],
-                      "shards": undefined,
-                      "sideCar": [Function],
-                      "style": undefined,
-                    }
-                  }
-                  noFocusGuards={false}
-                  onActivation={[Function]}
-                  onDeactivation={[Function]}
-                  persistentFocus={false}
-                  returnFocus={true}
-                  sideCar={[Function]}
+          <EuiOverlayMask>
+            <Portal
+              containerInfo={
+                <div
+                  class="euiOverlayMask euiOverlayMask--aboveHeader"
                 >
                   <div
-                    data-focus-guard={true}
-                    key="guard-first"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
                   />
                   <div
-                    data-focus-guard={true}
-                    key="guard-nearest"
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={1}
-                  />
-                  <RequireSideCar
-                    autoFocus={true}
-                    crossFrame={true}
-                    disabled={false}
-                    id={Object {}}
-                    observed={
+                    data-focus-lock-disabled="false"
+                  >
+                    <div
+                      class="euiModal modal-manage-email"
+                      style="max-width: 1000px;"
+                      tabindex="0"
+                    >
+                      <button
+                        aria-label="Closes this modal window"
+                        class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                        type="button"
+                      >
+                        <div>
+                          EuiIconMock
+                        </div>
+                      </button>
                       <div
-                        data-focus-lock-disabled="false"
+                        class="euiModal__flex"
                       >
                         <div
-                          class="euiModal modal-manage-email"
-                          style="max-width: 1000px;"
-                          tabindex="0"
+                          class="euiModalHeader"
                         >
-                          <button
-                            aria-label="Closes this modal window"
-                            class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                            type="button"
-                          >
-                            <div>
-                              EuiIconMock
-                            </div>
-                          </button>
                           <div
-                            class="euiModal__flex"
+                            class="euiModalHeader__title"
                           >
-                            <div
-                              class="euiModalHeader"
-                            >
-                              <div
-                                class="euiModalHeader__title"
-                              >
-                                Manage email senders
-                              </div>
-                            </div>
-                            <hr
-                              class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                            <div
-                              class="euiModalBody"
-                            >
-                              <div
-                                class="euiModalBody__overflow"
-                              >
-                                <div
-                                  style="display: flex; justify-content: center;"
-                                >
-                                  Loading Senders...
-                                </div>
-                              </div>
-                            </div>
+                            Manage email senders
                           </div>
                         </div>
-                      </div>
-                    }
-                    onActivation={[Function]}
-                    onDeactivation={[Function]}
-                    persistentFocus={false}
-                    returnFocus={[Function]}
-                    shards={Array []}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <SideCar
-                      autoFocus={true}
-                      crossFrame={true}
-                      disabled={false}
-                      id={Object {}}
-                      observed={
+                        <hr
+                          class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                        />
                         <div
-                          data-focus-lock-disabled="false"
+                          class="euiModalBody"
                         >
                           <div
-                            class="euiModal modal-manage-email"
-                            style="max-width: 1000px;"
-                            tabindex="0"
+                            class="euiModalBody__overflow"
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
-                              type="button"
-                            >
-                              <div>
-                                EuiIconMock
-                              </div>
-                            </button>
                             <div
-                              class="euiModal__flex"
+                              style="display: flex; justify-content: center;"
                             >
-                              <div
-                                class="euiModalHeader"
-                              >
-                                <div
-                                  class="euiModalHeader__title"
-                                >
-                                  Manage email senders
-                                </div>
-                              </div>
-                              <hr
-                                class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                              />
-                              <div
-                                class="euiModalBody"
-                              >
-                                <div
-                                  class="euiModalBody__overflow"
-                                >
-                                  <div
-                                    style="display: flex; justify-content: center;"
-                                  >
-                                    Loading Senders...
-                                  </div>
-                                </div>
-                              </div>
+                              Loading Senders...
                             </div>
                           </div>
                         </div>
-                      }
-                      onActivation={[Function]}
-                      onDeactivation={[Function]}
-                      persistentFocus={false}
-                      returnFocus={[Function]}
-                      shards={Array []}
-                      sideCar={
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-hidden="true"
+                    data-aria-hidden="true"
+                    data-focus-guard="true"
+                    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+                    tabindex="0"
+                  />
+                </div>
+              }
+            >
+              <EuiFocusTrap
+                clickOutsideDisables={false}
+                disabled={false}
+                noIsolation={true}
+                returnFocus={true}
+                scrollLock={false}
+              >
+                <ForwardRef
+                  enabled={true}
+                  noIsolation={true}
+                  onClickOutside={[Function]}
+                  returnFocus={true}
+                  scrollLock={false}
+                >
+                  <ForwardRef
+                    enabled={true}
+                    noIsolation={true}
+                    onClickOutside={[Function]}
+                    returnFocus={true}
+                    scrollLock={false}
+                    sideCar={[Function]}
+                  >
+                    <ForwardRef(FocusLockUI)
+                      as={
                         Object {
-                          "assignMedium": [Function],
-                          "assignSyncMedium": [Function],
-                          "options": Object {
-                            "async": true,
-                            "ssr": false,
+                          "$$typeof": Symbol(react.forward_ref),
+                          "classNames": Object {
+                            "fullWidth": "width-before-scroll-bar",
+                            "zeroRight": "right-scroll-bar-position",
                           },
-                          "read": [Function],
-                          "useMedium": [Function],
+                          "defaultProps": Object {
+                            "enabled": true,
+                            "inert": false,
+                            "removeScrollBar": true,
+                          },
+                          "render": [Function],
+                        }
+                      }
+                      autoFocus={true}
+                      crossFrame={true}
+                      disabled={false}
+                      lockProps={
+                        Object {
+                          "allowPinchZoom": undefined,
+                          "as": undefined,
+                          "enabled": false,
+                          "inert": undefined,
+                          "onMouseDown": [Function],
+                          "onTouchStart": [Function],
+                          "shards": undefined,
+                          "sideCar": [Function],
+                          "style": undefined,
                         }
                       }
+                      noFocusGuards={false}
+                      onActivation={[Function]}
+                      onDeactivation={[Function]}
+                      persistentFocus={false}
+                      returnFocus={true}
+                      sideCar={[Function]}
                     >
-                      <SideEffect(FocusWatcher)
+                      <div
+                        data-focus-guard={true}
+                        key="guard-first"
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                      <RequireSideCar
                         autoFocus={true}
                         crossFrame={true}
                         disabled={false}
@@ -1040,7 +890,7 @@ exports[`ManageSenders renders when visible 1`] = `
                             >
                               <button
                                 aria-label="Closes this modal window"
-                                class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                 type="button"
                               >
                                 <div>
@@ -1084,8 +934,20 @@ exports[`ManageSenders renders when visible 1`] = `
                         persistentFocus={false}
                         returnFocus={[Function]}
                         shards={Array []}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
                       >
-                        <FocusWatcher
+                        <SideCar
                           autoFocus={true}
                           crossFrame={true}
                           disabled={false}
@@ -1101,7 +963,7 @@ exports[`ManageSenders renders when visible 1`] = `
                               >
                                 <button
                                   aria-label="Closes this modal window"
-                                  class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                                  class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
                                   type="button"
                                 >
                                   <div>
@@ -1145,238 +1007,378 @@ exports[`ManageSenders renders when visible 1`] = `
                           persistentFocus={false}
                           returnFocus={[Function]}
                           shards={Array []}
-                        />
-                      </SideEffect(FocusWatcher)>
-                    </SideCar>
-                  </RequireSideCar>
-                  <ForwardRef
-                    data-focus-lock-disabled={false}
-                    enabled={false}
-                    inert={false}
-                    onBlur={[Function]}
-                    onFocus={[Function]}
-                    onMouseDown={[Function]}
-                    onTouchStart={[Function]}
-                    removeScrollBar={true}
-                    sideCar={[Function]}
-                  >
-                    <div
-                      data-focus-lock-disabled={false}
-                      onBlur={[Function]}
-                      onFocus={[Function]}
-                      onMouseDown={[Function]}
-                      onScrollCapture={[Function]}
-                      onTouchMoveCapture={[Function]}
-                      onTouchStart={[Function]}
-                      onWheelCapture={[Function]}
-                    >
-                      <div
-                        className="euiModal modal-manage-email"
-                        onKeyDown={[Function]}
-                        style={
-                          Object {
-                            "maxWidth": "1000px",
+                          sideCar={
+                            Object {
+                              "assignMedium": [Function],
+                              "assignSyncMedium": [Function],
+                              "options": Object {
+                                "async": true,
+                                "ssr": false,
+                              },
+                              "read": [Function],
+                              "useMedium": [Function],
+                            }
                           }
-                        }
-                        tabIndex={0}
-                      >
-                        <EuiI18n
-                          default="Closes this modal window"
-                          token="euiModal.closeModal"
                         >
-                          <EuiButtonIcon
-                            aria-label="Closes this modal window"
-                            className="euiModal__closeIcon"
-                            color="text"
-                            iconType="cross"
-                            onClick={[Function]}
+                          <SideEffect(FocusWatcher)
+                            autoFocus={true}
+                            crossFrame={true}
+                            disabled={false}
+                            id={Object {}}
+                            observed={
+                              <div
+                                data-focus-lock-disabled="false"
+                              >
+                                <div
+                                  class="euiModal modal-manage-email"
+                                  style="max-width: 1000px;"
+                                  tabindex="0"
+                                >
+                                  <button
+                                    aria-label="Closes this modal window"
+                                    class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                    type="button"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </button>
+                                  <div
+                                    class="euiModal__flex"
+                                  >
+                                    <div
+                                      class="euiModalHeader"
+                                    >
+                                      <div
+                                        class="euiModalHeader__title"
+                                      >
+                                        Manage email senders
+                                      </div>
+                                    </div>
+                                    <hr
+                                      class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                    />
+                                    <div
+                                      class="euiModalBody"
+                                    >
+                                      <div
+                                        class="euiModalBody__overflow"
+                                      >
+                                        <div
+                                          style="display: flex; justify-content: center;"
+                                        >
+                                          Loading Senders...
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
+                                </div>
+                              </div>
+                            }
+                            onActivation={[Function]}
+                            onDeactivation={[Function]}
+                            persistentFocus={false}
+                            returnFocus={[Function]}
+                            shards={Array []}
                           >
-                            <button
-                              aria-label="Closes this modal window"
-                              className="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
+                            <FocusWatcher
+                              autoFocus={true}
+                              crossFrame={true}
                               disabled={false}
-                              onClick={[Function]}
-                              type="button"
-                            >
-                              <EuiIcon
-                                aria-hidden="true"
-                                className="euiButtonIcon__icon"
-                                size="m"
-                                type="cross"
-                              >
-                                <div>
-                                  EuiIconMock
+                              id={Object {}}
+                              observed={
+                                <div
+                                  data-focus-lock-disabled="false"
+                                >
+                                  <div
+                                    class="euiModal modal-manage-email"
+                                    style="max-width: 1000px;"
+                                    tabindex="0"
+                                  >
+                                    <button
+                                      aria-label="Closes this modal window"
+                                      class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                      type="button"
+                                    >
+                                      <div>
+                                        EuiIconMock
+                                      </div>
+                                    </button>
+                                    <div
+                                      class="euiModal__flex"
+                                    >
+                                      <div
+                                        class="euiModalHeader"
+                                      >
+                                        <div
+                                          class="euiModalHeader__title"
+                                        >
+                                          Manage email senders
+                                        </div>
+                                      </div>
+                                      <hr
+                                        class="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                      />
+                                      <div
+                                        class="euiModalBody"
+                                      >
+                                        <div
+                                          class="euiModalBody__overflow"
+                                        >
+                                          <div
+                                            style="display: flex; justify-content: center;"
+                                          >
+                                            Loading Senders...
+                                          </div>
+                                        </div>
+                                      </div>
+                                    </div>
+                                  </div>
                                 </div>
-                              </EuiIcon>
-                            </button>
-                          </EuiButtonIcon>
-                        </EuiI18n>
+                              }
+                              onActivation={[Function]}
+                              onDeactivation={[Function]}
+                              persistentFocus={false}
+                              returnFocus={[Function]}
+                              shards={Array []}
+                            />
+                          </SideEffect(FocusWatcher)>
+                        </SideCar>
+                      </RequireSideCar>
+                      <ForwardRef
+                        data-focus-lock-disabled={false}
+                        enabled={false}
+                        inert={false}
+                        onBlur={[Function]}
+                        onFocus={[Function]}
+                        onMouseDown={[Function]}
+                        onTouchStart={[Function]}
+                        removeScrollBar={true}
+                        sideCar={[Function]}
+                      >
                         <div
-                          className="euiModal__flex"
+                          data-focus-lock-disabled={false}
+                          onBlur={[Function]}
+                          onFocus={[Function]}
+                          onMouseDown={[Function]}
+                          onScrollCapture={[Function]}
+                          onTouchMoveCapture={[Function]}
+                          onTouchStart={[Function]}
+                          onWheelCapture={[Function]}
                         >
-                          <EuiModalHeader>
+                          <div
+                            className="euiModal modal-manage-email"
+                            onKeyDown={[Function]}
+                            style={
+                              Object {
+                                "maxWidth": "1000px",
+                              }
+                            }
+                            tabIndex={0}
+                          >
+                            <EuiI18n
+                              default="Closes this modal window"
+                              token="euiModal.closeModal"
+                            >
+                              <EuiButtonIcon
+                                aria-label="Closes this modal window"
+                                className="euiModal__closeIcon"
+                                color="text"
+                                iconType="cross"
+                                onClick={[Function]}
+                              >
+                                <button
+                                  aria-label="Closes this modal window"
+                                  className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon"
+                                  disabled={false}
+                                  onClick={[Function]}
+                                  type="button"
+                                >
+                                  <EuiIcon
+                                    aria-hidden="true"
+                                    className="euiButtonIcon__icon"
+                                    color="inherit"
+                                    size="m"
+                                    type="cross"
+                                  >
+                                    <div>
+                                      EuiIconMock
+                                    </div>
+                                  </EuiIcon>
+                                </button>
+                              </EuiButtonIcon>
+                            </EuiI18n>
                             <div
-                              className="euiModalHeader"
+                              className="euiModal__flex"
                             >
-                              <EuiModalHeaderTitle>
+                              <EuiModalHeader>
                                 <div
-                                  className="euiModalHeader__title"
+                                  className="euiModalHeader"
                                 >
-                                  Manage email senders
+                                  <EuiModalHeaderTitle>
+                                    <div
+                                      className="euiModalHeader__title"
+                                    >
+                                      Manage email senders
+                                    </div>
+                                  </EuiModalHeaderTitle>
                                 </div>
-                              </EuiModalHeaderTitle>
-                            </div>
-                          </EuiModalHeader>
-                          <EuiHorizontalRule
-                            margin="s"
-                          >
-                            <hr
-                              className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
-                            />
-                          </EuiHorizontalRule>
-                          <EuiModalBody>
-                            <div
-                              className="euiModalBody"
-                            >
-                              <div
-                                className="euiModalBody__overflow"
+                              </EuiModalHeader>
+                              <EuiHorizontalRule
+                                margin="s"
                               >
-                                <FormikConnect(FieldArrayInner)
-                                  name="senders"
-                                  validateOnChange={true}
+                                <hr
+                                  className="euiHorizontalRule euiHorizontalRule--full euiHorizontalRule--marginSmall"
+                                />
+                              </EuiHorizontalRule>
+                              <EuiModalBody>
+                                <div
+                                  className="euiModalBody"
                                 >
-                                  <FieldArrayInner
-                                    formik={
-                                      Object {
-                                        "dirty": false,
-                                        "errors": Object {},
-                                        "getFieldHelpers": [Function],
-                                        "getFieldMeta": [Function],
-                                        "getFieldProps": [Function],
-                                        "handleBlur": [Function],
-                                        "handleChange": [Function],
-                                        "handleReset": [Function],
-                                        "handleSubmit": [Function],
-                                        "initialErrors": Object {},
-                                        "initialStatus": undefined,
-                                        "initialTouched": Object {},
-                                        "initialValues": Object {},
-                                        "isSubmitting": false,
-                                        "isValid": true,
-                                        "isValidating": false,
-                                        "registerField": [Function],
-                                        "resetForm": [Function],
-                                        "setErrors": [Function],
-                                        "setFieldError": [Function],
-                                        "setFieldTouched": [Function],
-                                        "setFieldValue": [Function],
-                                        "setFormikState": [Function],
-                                        "setStatus": [Function],
-                                        "setSubmitting": [Function],
-                                        "setTouched": [Function],
-                                        "setValues": [Function],
-                                        "status": undefined,
-                                        "submitCount": 0,
-                                        "submitForm": [Function],
-                                        "touched": Object {},
-                                        "unregisterField": [Function],
-                                        "validateField": [Function],
-                                        "validateForm": [Function],
-                                        "validateOnBlur": true,
-                                        "validateOnChange": false,
-                                        "validateOnMount": false,
-                                        "values": Object {},
-                                      }
-                                    }
-                                    name="senders"
-                                    validateOnChange={true}
+                                  <div
+                                    className="euiModalBody__overflow"
                                   >
-                                    <div
-                                      style={
-                                        Object {
-                                          "display": "flex",
-                                          "justifyContent": "center",
-                                        }
-                                      }
+                                    <FormikConnect(FieldArrayInner)
+                                      name="senders"
+                                      validateOnChange={true}
                                     >
-                                      Loading Senders...
-                                    </div>
-                                  </FieldArrayInner>
-                                </FormikConnect(FieldArrayInner)>
-                              </div>
+                                      <FieldArrayInner
+                                        formik={
+                                          Object {
+                                            "dirty": false,
+                                            "errors": Object {},
+                                            "getFieldHelpers": [Function],
+                                            "getFieldMeta": [Function],
+                                            "getFieldProps": [Function],
+                                            "handleBlur": [Function],
+                                            "handleChange": [Function],
+                                            "handleReset": [Function],
+                                            "handleSubmit": [Function],
+                                            "initialErrors": Object {},
+                                            "initialStatus": undefined,
+                                            "initialTouched": Object {},
+                                            "initialValues": Object {},
+                                            "isSubmitting": false,
+                                            "isValid": true,
+                                            "isValidating": false,
+                                            "registerField": [Function],
+                                            "resetForm": [Function],
+                                            "setErrors": [Function],
+                                            "setFieldError": [Function],
+                                            "setFieldTouched": [Function],
+                                            "setFieldValue": [Function],
+                                            "setFormikState": [Function],
+                                            "setStatus": [Function],
+                                            "setSubmitting": [Function],
+                                            "setTouched": [Function],
+                                            "setValues": [Function],
+                                            "status": undefined,
+                                            "submitCount": 0,
+                                            "submitForm": [Function],
+                                            "touched": Object {},
+                                            "unregisterField": [Function],
+                                            "validateField": [Function],
+                                            "validateForm": [Function],
+                                            "validateOnBlur": true,
+                                            "validateOnChange": false,
+                                            "validateOnMount": false,
+                                            "values": Object {},
+                                          }
+                                        }
+                                        name="senders"
+                                        validateOnChange={true}
+                                      >
+                                        <div
+                                          style={
+                                            Object {
+                                              "display": "flex",
+                                              "justifyContent": "center",
+                                            }
+                                          }
+                                        >
+                                          Loading Senders...
+                                        </div>
+                                      </FieldArrayInner>
+                                    </FormikConnect(FieldArrayInner)>
+                                  </div>
+                                </div>
+                              </EuiModalBody>
                             </div>
-                          </EuiModalBody>
+                          </div>
                         </div>
-                      </div>
-                    </div>
-                  </ForwardRef>
-                  <div
-                    data-focus-guard={true}
-                    style={
-                      Object {
-                        "height": "0px",
-                        "left": "1px",
-                        "overflow": "hidden",
-                        "padding": 0,
-                        "position": "fixed",
-                        "top": "1px",
-                        "width": "1px",
-                      }
-                    }
-                    tabIndex={0}
-                  />
-                </ForwardRef>
-                <RequireSideCar
-                  noIsolation={true}
-                  setLockProps={[Function]}
-                  sideCar={
-                    Object {
-                      "assignMedium": [Function],
-                      "assignSyncMedium": [Function],
-                      "options": Object {
-                        "async": true,
-                        "ssr": false,
-                      },
-                      "read": [Function],
-                      "useMedium": [Function],
-                    }
-                  }
-                >
-                  <SideCar
-                    noIsolation={true}
-                    setLockProps={[Function]}
-                    sideCar={
-                      Object {
-                        "assignMedium": [Function],
-                        "assignSyncMedium": [Function],
-                        "options": Object {
-                          "async": true,
-                          "ssr": false,
-                        },
-                        "read": [Function],
-                        "useMedium": [Function],
-                      }
-                    }
-                  >
-                    <Effect
+                      </ForwardRef>
+                      <div
+                        data-focus-guard={true}
+                        style={
+                          Object {
+                            "height": "0px",
+                            "left": "1px",
+                            "overflow": "hidden",
+                            "padding": 0,
+                            "position": "fixed",
+                            "top": "1px",
+                            "width": "1px",
+                          }
+                        }
+                        tabIndex={0}
+                      />
+                    </ForwardRef(FocusLockUI)>
+                    <RequireSideCar
                       noIsolation={true}
+                      onClickOutside={[Function]}
                       setLockProps={[Function]}
+                      sideCar={
+                        Object {
+                          "assignMedium": [Function],
+                          "assignSyncMedium": [Function],
+                          "options": Object {
+                            "async": true,
+                            "ssr": false,
+                          },
+                          "read": [Function],
+                          "useMedium": [Function],
+                        }
+                      }
                     >
-                      <Component>
-                        <Sheet
-                          styles="
+                      <SideCar
+                        noIsolation={true}
+                        onClickOutside={[Function]}
+                        setLockProps={[Function]}
+                        sideCar={
+                          Object {
+                            "assignMedium": [Function],
+                            "assignSyncMedium": [Function],
+                            "options": Object {
+                              "async": true,
+                              "ssr": false,
+                            },
+                            "read": [Function],
+                            "useMedium": [Function],
+                          }
+                        }
+                      >
+                        <Effect
+                          noIsolation={true}
+                          onClickOutside={[Function]}
+                          setLockProps={[Function]}
+                        >
+                          <Component>
+                            <Sheet
+                              styles="
  [data-focus-on-hidden] {
    pointer-events: none !important;
  }
 "
-                        />
-                      </Component>
-                    </Effect>
-                  </SideCar>
-                </RequireSideCar>
-              </ForwardRef>
-            </ForwardRef>
-          </EuiFocusTrap>
+                            />
+                          </Component>
+                        </Effect>
+                      </SideCar>
+                    </RequireSideCar>
+                  </ForwardRef>
+                </ForwardRef>
+              </EuiFocusTrap>
+            </Portal>
+          </EuiOverlayMask>
         </EuiModal>
       </Portal>
     </EuiOverlayMask>
diff --git a/public/pages/Destinations/containers/DestinationsList/__snapshots__/DestinationsList.test.js.snap b/public/pages/Destinations/containers/DestinationsList/__snapshots__/DestinationsList.test.js.snap
index 9dacca178..3cbd3af90 100644
--- a/public/pages/Destinations/containers/DestinationsList/__snapshots__/DestinationsList.test.js.snap
+++ b/public/pages/Destinations/containers/DestinationsList/__snapshots__/DestinationsList.test.js.snap
@@ -67,21 +67,31 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
             </span>
           </div>
           <EuiText
+            color="default"
             size="s"
           >
             <div
               className="euiText euiText--small"
             >
-              <p>
-                Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
-                <EuiSpacer
-                  size="l"
+              <EuiTextColor
+                color="default"
+                component="div"
+              >
+                <div
+                  className="euiTextColor euiTextColor--default"
                 >
-                  <div
-                    className="euiSpacer euiSpacer--l"
-                  />
-                </EuiSpacer>
-              </p>
+                  <p>
+                    Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
+                    <EuiSpacer
+                      size="l"
+                    >
+                      <div
+                        className="euiSpacer euiSpacer--l"
+                      />
+                    </EuiSpacer>
+                  </p>
+                </div>
+              </EuiTextColor>
             </div>
           </EuiText>
         </div>
@@ -111,6 +121,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
             <EuiIcon
               aria-hidden="true"
               className="euiCallOutHeader__icon"
+              color="inherit"
               size="m"
               type="alert"
             >
@@ -125,43 +136,48 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
             </span>
           </div>
           <EuiText
+            color="default"
             size="s"
           >
             <div
               className="euiText euiText--small"
             >
-              <p>
-                Install the notifications plugin in order to create and select channels to send out notifications.
-                 
-                <EuiLink
-                  external={true}
-                  href="#"
+              <EuiTextColor
+                color="default"
+                component="div"
+              >
+                <div
+                  className="euiTextColor euiTextColor--default"
                 >
-                  <a
-                    className="euiLink euiLink--primary"
-                    href="#"
-                    rel="noreferrer"
-                  >
-                    Learn more
-                    <EuiI18n
-                      default="External link"
-                      token="euiLink.external.ariaLabel"
+                  <p>
+                    Install the notifications plugin in order to create and select channels to send out notifications.
+                     
+                    <EuiLink
+                      external={true}
+                      href="#"
                     >
-                      <EuiIcon
-                        aria-label="External link"
-                        className="euiLink__externalIcon"
-                        size="s"
-                        type="popout"
+                      <a
+                        className="euiLink euiLink--primary"
+                        href="#"
+                        rel="noreferrer"
                       >
-                        <div>
-                          EuiIconMock
-                        </div>
-                      </EuiIcon>
-                    </EuiI18n>
-                  </a>
-                </EuiLink>
-                .
-              </p>
+                        Learn more
+                        <EuiIcon
+                          aria-label="External link"
+                          className="euiLink__externalIcon"
+                          size="s"
+                          type="popout"
+                        >
+                          <div>
+                            EuiIconMock
+                          </div>
+                        </EuiIcon>
+                      </a>
+                    </EuiLink>
+                    .
+                  </p>
+                </div>
+              </EuiTextColor>
             </div>
           </EuiText>
         </div>
@@ -199,7 +215,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
       }
     >
       <div
-        className="euiPanel euiPanel--paddingMedium"
+        className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
             "paddingLeft": "0px",
@@ -288,80 +304,77 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                     hasArrow={true}
                                     id="destinationActionsPopover"
                                     isOpen={false}
-                                    ownFocus={false}
+                                    ownFocus={true}
                                     panelPaddingSize="none"
                                   >
-                                    <EuiOutsideClickDetector
-                                      isDisabled={true}
-                                      onOutsideClick={[Function]}
+                                    <div
+                                      className="euiPopover euiPopover--anchorDownLeft"
+                                      id="destinationActionsPopover"
                                     >
                                       <div
-                                        className="euiPopover euiPopover--anchorDownLeft"
-                                        id="destinationActionsPopover"
-                                        onKeyDown={[Function]}
-                                        onMouseDown={[Function]}
-                                        onMouseUp={[Function]}
-                                        onTouchEnd={[Function]}
-                                        onTouchStart={[Function]}
+                                        className="euiPopover__anchor"
                                       >
-                                        <div
-                                          className="euiPopover__anchor"
+                                        <EuiButton
+                                          iconSide="right"
+                                          iconType="arrowDown"
+                                          onClick={[Function]}
                                         >
-                                          <EuiButton
+                                          <EuiButtonDisplay
+                                            baseClassName="euiButton"
+                                            disabled={false}
+                                            element="button"
                                             iconSide="right"
                                             iconType="arrowDown"
+                                            isDisabled={false}
                                             onClick={[Function]}
+                                            type="button"
                                           >
-                                            <EuiButtonDisplay
+                                            <button
+                                              className="euiButton euiButton--primary"
                                               disabled={false}
-                                              element="button"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              isDisabled={false}
                                               onClick={[Function]}
+                                              style={
+                                                Object {
+                                                  "minWidth": undefined,
+                                                }
+                                              }
                                               type="button"
                                             >
-                                              <button
-                                                className="euiButton euiButton--primary"
-                                                disabled={false}
-                                                onClick={[Function]}
-                                                type="button"
-                                              >
-                                                <EuiButtonContent
-                                                  className="euiButton__content"
-                                                  iconSide="right"
-                                                  iconType="arrowDown"
-                                                  textProps={
-                                                    Object {
-                                                      "className": "euiButton__text",
-                                                    }
+                                              <EuiButtonContent
+                                                className="euiButton__content"
+                                                iconSide="right"
+                                                iconType="arrowDown"
+                                                textProps={
+                                                  Object {
+                                                    "className": "euiButton__text",
                                                   }
+                                                }
+                                              >
+                                                <span
+                                                  className="euiButtonContent euiButtonContent--iconRight euiButton__content"
                                                 >
+                                                  <EuiIcon
+                                                    className="euiButtonContent__icon"
+                                                    color="inherit"
+                                                    size="m"
+                                                    type="arrowDown"
+                                                  >
+                                                    <div>
+                                                      EuiIconMock
+                                                    </div>
+                                                  </EuiIcon>
                                                   <span
-                                                    className="euiButtonContent euiButtonContent--iconRight euiButton__content"
+                                                    className="euiButton__text"
                                                   >
-                                                    <EuiIcon
-                                                      className="euiButtonContent__icon"
-                                                      size="m"
-                                                      type="arrowDown"
-                                                    >
-                                                      <div>
-                                                        EuiIconMock
-                                                      </div>
-                                                    </EuiIcon>
-                                                    <span
-                                                      className="euiButton__text"
-                                                    >
-                                                      Actions
-                                                    </span>
+                                                    Actions
                                                   </span>
-                                                </EuiButtonContent>
-                                              </button>
-                                            </EuiButtonDisplay>
-                                          </EuiButton>
-                                        </div>
+                                                </span>
+                                              </EuiButtonContent>
+                                            </button>
+                                          </EuiButtonDisplay>
+                                        </EuiButton>
                                       </div>
-                                    </EuiOutsideClickDetector>
+                                    </div>
                                   </EuiPopover>
                                 </div>
                               </EuiFlexItem>
@@ -497,7 +510,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                           >
                             <EuiValidatableControl>
                               <input
-                                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                className="euiFieldSearch euiFieldSearch--fullWidth"
                                 onChange={[Function]}
                                 onKeyUp={[Function]}
                                 placeholder="Search"
@@ -506,6 +519,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                               />
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon="search"
                               isLoading={false}
                             >
@@ -513,6 +527,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 className="euiFormControlLayoutIcons"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="search"
                                 >
                                   <span
@@ -521,6 +536,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="search"
                                     >
                                       <div>
@@ -628,6 +644,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -640,6 +657,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -648,6 +666,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -711,7 +730,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                             >
                               <button
                                 aria-label="Previous page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-previous"
                                 disabled={true}
                                 onClick={[Function]}
@@ -720,6 +739,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowLeft"
                                 >
@@ -775,12 +795,12 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                       data-test-subj="pagination-button-0"
                                       isDisabled={true}
                                       onClick={[Function]}
-                                      size="xs"
+                                      size="s"
                                     >
                                       <button
                                         aria-current={true}
                                         aria-label="Page 1 of 1"
-                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                         data-test-subj="pagination-button-0"
                                         disabled={true}
                                         onClick={[Function]}
@@ -789,6 +809,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="left"
+                                          iconSize="m"
                                           textProps={
                                             Object {
                                               "className": "euiButtonEmpty__text",
@@ -836,7 +857,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                             >
                               <button
                                 aria-label="Next page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-next"
                                 disabled={true}
                                 onClick={[Function]}
@@ -845,6 +866,7 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowRight"
                                 >
@@ -1028,73 +1050,65 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                   ownFocus={true}
                                   panelPaddingSize="none"
                                 >
-                                  <EuiOutsideClickDetector
-                                    isDisabled={true}
-                                    onOutsideClick={[Function]}
+                                  <div
+                                    className="euiPopover euiPopover--anchorDownRight"
                                   >
                                     <div
-                                      className="euiPopover euiPopover--anchorDownRight"
-                                      onKeyDown={[Function]}
-                                      onMouseDown={[Function]}
-                                      onMouseUp={[Function]}
-                                      onTouchEnd={[Function]}
-                                      onTouchStart={[Function]}
+                                      className="euiPopover__anchor"
                                     >
-                                      <div
-                                        className="euiPopover__anchor"
+                                      <EuiButtonEmpty
+                                        flush="right"
+                                        iconSide="right"
+                                        iconType="arrowDown"
+                                        onClick={[Function]}
+                                        size="xs"
                                       >
-                                        <EuiButtonEmpty
-                                          flush="right"
-                                          iconSide="right"
-                                          iconType="arrowDown"
+                                        <button
+                                          className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+                                          disabled={false}
                                           onClick={[Function]}
-                                          size="xs"
+                                          type="button"
                                         >
-                                          <button
-                                            className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                                            disabled={false}
-                                            onClick={[Function]}
-                                            type="button"
-                                          >
-                                            <EuiButtonContent
-                                              className="euiButtonEmpty__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
-                                                Object {
-                                                  "className": "euiButtonEmpty__text",
-                                                }
+                                          <EuiButtonContent
+                                            className="euiButtonEmpty__content"
+                                            iconSide="right"
+                                            iconSize="s"
+                                            iconType="arrowDown"
+                                            textProps={
+                                              Object {
+                                                "className": "euiButtonEmpty__text",
                                               }
+                                            }
+                                          >
+                                            <span
+                                              className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                                             >
+                                              <EuiIcon
+                                                className="euiButtonContent__icon"
+                                                color="inherit"
+                                                size="s"
+                                                type="arrowDown"
+                                              >
+                                                <div>
+                                                  EuiIconMock
+                                                </div>
+                                              </EuiIcon>
                                               <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                                                className="euiButtonEmpty__text"
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  size="m"
-                                                  type="arrowDown"
-                                                >
-                                                  <div>
-                                                    EuiIconMock
-                                                  </div>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButtonEmpty__text"
+                                                <EuiI18n
+                                                  default="Sorting"
+                                                  token="euiTableSortMobile.sorting"
                                                 >
-                                                  <EuiI18n
-                                                    default="Sorting"
-                                                    token="euiTableSortMobile.sorting"
-                                                  >
-                                                    Sorting
-                                                  </EuiI18n>
-                                                </span>
+                                                  Sorting
+                                                </EuiI18n>
                                               </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonEmpty>
-                                      </div>
+                                            </span>
+                                          </EuiButtonContent>
+                                        </button>
+                                      </EuiButtonEmpty>
                                     </div>
-                                  </EuiOutsideClickDetector>
+                                  </div>
                                 </EuiPopover>
                               </div>
                             </EuiTableSortMobile>
@@ -1154,39 +1168,35 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSortAscending={false}
+                                  isSorted={true}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "descending",
-                                          "innerText": "Destination name",
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
+                                      <EuiI18n
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Destination name",
+                                          }
                                         }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Destination name; Sorted in descending order"
                                       >
-                                        Destination name
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiI18n
-                                    default="Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.sortedAriaLabel"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "descending",
-                                      }
-                                    }
-                                  >
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Destination name"
+                                        >
+                                          Destination name
+                                        </span>
+                                      </EuiI18n>
+                                    </EuiInnerText>
                                     <EuiIcon
-                                      aria-label="Sorted in descending order"
                                       className="euiTableSortIcon"
                                       size="m"
                                       type="sortDown"
@@ -1195,20 +1205,8 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                         EuiIconMock
                                       </div>
                                     </EuiIcon>
-                                  </EuiI18n>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
-                                      <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
-                                      >
-                                        Click to sort in ascending order
-                                      </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -1239,41 +1237,35 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Destination type",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Destination type"
-                                      >
-                                        Destination type
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Destination type",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Destination type"
+                                        >
+                                          Destination type
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -1304,41 +1296,35 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Last updated by",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Last updated by"
-                                      >
-                                        Last updated by
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Last updated by",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Last updated by"
+                                        >
+                                          Last updated by
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -1357,18 +1343,34 @@ exports[`DestinationsList renders when Notification plugin is installed 1`] = `
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent euiTableCellContent--alignRight"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="Actions"
-                                  >
-                                    Actions
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent euiTableCellContent--alignRight"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "Actions",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="Actions"
+                                      >
+                                        Actions
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                         </tr>
@@ -1539,21 +1541,31 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
             </span>
           </div>
           <EuiText
+            color="default"
             size="s"
           >
             <div
               className="euiText euiText--small"
             >
-              <p>
-                Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
-                <EuiSpacer
-                  size="l"
+              <EuiTextColor
+                color="default"
+                component="div"
+              >
+                <div
+                  className="euiTextColor euiTextColor--default"
                 >
-                  <div
-                    className="euiSpacer euiSpacer--l"
-                  />
-                </EuiSpacer>
-              </p>
+                  <p>
+                    Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
+                    <EuiSpacer
+                      size="l"
+                    >
+                      <div
+                        className="euiSpacer euiSpacer--l"
+                      />
+                    </EuiSpacer>
+                  </p>
+                </div>
+              </EuiTextColor>
             </div>
           </EuiText>
         </div>
@@ -1583,6 +1595,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
             <EuiIcon
               aria-hidden="true"
               className="euiCallOutHeader__icon"
+              color="inherit"
               size="m"
               type="alert"
             >
@@ -1597,43 +1610,48 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
             </span>
           </div>
           <EuiText
+            color="default"
             size="s"
           >
             <div
               className="euiText euiText--small"
             >
-              <p>
-                Install the notifications plugin in order to create and select channels to send out notifications.
-                 
-                <EuiLink
-                  external={true}
-                  href="#"
+              <EuiTextColor
+                color="default"
+                component="div"
+              >
+                <div
+                  className="euiTextColor euiTextColor--default"
                 >
-                  <a
-                    className="euiLink euiLink--primary"
-                    href="#"
-                    rel="noreferrer"
-                  >
-                    Learn more
-                    <EuiI18n
-                      default="External link"
-                      token="euiLink.external.ariaLabel"
+                  <p>
+                    Install the notifications plugin in order to create and select channels to send out notifications.
+                     
+                    <EuiLink
+                      external={true}
+                      href="#"
                     >
-                      <EuiIcon
-                        aria-label="External link"
-                        className="euiLink__externalIcon"
-                        size="s"
-                        type="popout"
+                      <a
+                        className="euiLink euiLink--primary"
+                        href="#"
+                        rel="noreferrer"
                       >
-                        <div>
-                          EuiIconMock
-                        </div>
-                      </EuiIcon>
-                    </EuiI18n>
-                  </a>
-                </EuiLink>
-                .
-              </p>
+                        Learn more
+                        <EuiIcon
+                          aria-label="External link"
+                          className="euiLink__externalIcon"
+                          size="s"
+                          type="popout"
+                        >
+                          <div>
+                            EuiIconMock
+                          </div>
+                        </EuiIcon>
+                      </a>
+                    </EuiLink>
+                    .
+                  </p>
+                </div>
+              </EuiTextColor>
             </div>
           </EuiText>
         </div>
@@ -1671,7 +1689,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
       }
     >
       <div
-        className="euiPanel euiPanel--paddingMedium"
+        className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
             "paddingLeft": "0px",
@@ -1864,7 +1882,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                           >
                             <EuiValidatableControl>
                               <input
-                                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                className="euiFieldSearch euiFieldSearch--fullWidth"
                                 onChange={[Function]}
                                 onKeyUp={[Function]}
                                 placeholder="Search"
@@ -1873,6 +1891,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                               />
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon="search"
                               isLoading={false}
                             >
@@ -1880,6 +1899,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 className="euiFormControlLayoutIcons"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="search"
                                 >
                                   <span
@@ -1888,6 +1908,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="search"
                                     >
                                       <div>
@@ -1955,6 +1976,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -1967,6 +1989,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -1975,6 +1998,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -2038,7 +2062,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                             >
                               <button
                                 aria-label="Previous page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-previous"
                                 disabled={true}
                                 onClick={[Function]}
@@ -2047,6 +2071,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowLeft"
                                 >
@@ -2102,12 +2127,12 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                       data-test-subj="pagination-button-0"
                                       isDisabled={true}
                                       onClick={[Function]}
-                                      size="xs"
+                                      size="s"
                                     >
                                       <button
                                         aria-current={true}
                                         aria-label="Page 1 of 1"
-                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                         data-test-subj="pagination-button-0"
                                         disabled={true}
                                         onClick={[Function]}
@@ -2116,6 +2141,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="left"
+                                          iconSize="m"
                                           textProps={
                                             Object {
                                               "className": "euiButtonEmpty__text",
@@ -2163,7 +2189,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                             >
                               <button
                                 aria-label="Next page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-next"
                                 disabled={true}
                                 onClick={[Function]}
@@ -2172,6 +2198,7 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowRight"
                                 >
@@ -2355,73 +2382,65 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                   ownFocus={true}
                                   panelPaddingSize="none"
                                 >
-                                  <EuiOutsideClickDetector
-                                    isDisabled={true}
-                                    onOutsideClick={[Function]}
+                                  <div
+                                    className="euiPopover euiPopover--anchorDownRight"
                                   >
                                     <div
-                                      className="euiPopover euiPopover--anchorDownRight"
-                                      onKeyDown={[Function]}
-                                      onMouseDown={[Function]}
-                                      onMouseUp={[Function]}
-                                      onTouchEnd={[Function]}
-                                      onTouchStart={[Function]}
+                                      className="euiPopover__anchor"
                                     >
-                                      <div
-                                        className="euiPopover__anchor"
+                                      <EuiButtonEmpty
+                                        flush="right"
+                                        iconSide="right"
+                                        iconType="arrowDown"
+                                        onClick={[Function]}
+                                        size="xs"
                                       >
-                                        <EuiButtonEmpty
-                                          flush="right"
-                                          iconSide="right"
-                                          iconType="arrowDown"
+                                        <button
+                                          className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+                                          disabled={false}
                                           onClick={[Function]}
-                                          size="xs"
+                                          type="button"
                                         >
-                                          <button
-                                            className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                                            disabled={false}
-                                            onClick={[Function]}
-                                            type="button"
-                                          >
-                                            <EuiButtonContent
-                                              className="euiButtonEmpty__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
-                                                Object {
-                                                  "className": "euiButtonEmpty__text",
-                                                }
+                                          <EuiButtonContent
+                                            className="euiButtonEmpty__content"
+                                            iconSide="right"
+                                            iconSize="s"
+                                            iconType="arrowDown"
+                                            textProps={
+                                              Object {
+                                                "className": "euiButtonEmpty__text",
                                               }
+                                            }
+                                          >
+                                            <span
+                                              className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                                             >
+                                              <EuiIcon
+                                                className="euiButtonContent__icon"
+                                                color="inherit"
+                                                size="s"
+                                                type="arrowDown"
+                                              >
+                                                <div>
+                                                  EuiIconMock
+                                                </div>
+                                              </EuiIcon>
                                               <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                                                className="euiButtonEmpty__text"
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  size="m"
-                                                  type="arrowDown"
+                                                <EuiI18n
+                                                  default="Sorting"
+                                                  token="euiTableSortMobile.sorting"
                                                 >
-                                                  <div>
-                                                    EuiIconMock
-                                                  </div>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButtonEmpty__text"
-                                                >
-                                                  <EuiI18n
-                                                    default="Sorting"
-                                                    token="euiTableSortMobile.sorting"
-                                                  >
-                                                    Sorting
-                                                  </EuiI18n>
-                                                </span>
+                                                  Sorting
+                                                </EuiI18n>
                                               </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonEmpty>
-                                      </div>
+                                            </span>
+                                          </EuiButtonContent>
+                                        </button>
+                                      </EuiButtonEmpty>
                                     </div>
-                                  </EuiOutsideClickDetector>
+                                  </div>
                                 </EuiPopover>
                               </div>
                             </EuiTableSortMobile>
@@ -2481,39 +2500,35 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSortAscending={false}
+                                  isSorted={true}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "descending",
-                                          "innerText": "Destination name",
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
+                                      <EuiI18n
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Destination name",
+                                          }
                                         }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Destination name; Sorted in descending order"
                                       >
-                                        Destination name
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiI18n
-                                    default="Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.sortedAriaLabel"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "descending",
-                                      }
-                                    }
-                                  >
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Destination name"
+                                        >
+                                          Destination name
+                                        </span>
+                                      </EuiI18n>
+                                    </EuiInnerText>
                                     <EuiIcon
-                                      aria-label="Sorted in descending order"
                                       className="euiTableSortIcon"
                                       size="m"
                                       type="sortDown"
@@ -2522,20 +2537,8 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                         EuiIconMock
                                       </div>
                                     </EuiIcon>
-                                  </EuiI18n>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
-                                      <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
-                                      >
-                                        Click to sort in ascending order
-                                      </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -2566,41 +2569,35 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Destination type",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Destination type"
-                                      >
-                                        Destination type
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Destination type",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Destination type"
+                                        >
+                                          Destination type
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -2631,41 +2628,35 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Last updated by",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Last updated by"
-                                      >
-                                        Last updated by
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Last updated by",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Last updated by"
+                                        >
+                                          Last updated by
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -2684,18 +2675,34 @@ exports[`DestinationsList renders when Notification plugin is not installed 1`]
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent euiTableCellContent--alignRight"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="Actions"
-                                  >
-                                    Actions
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent euiTableCellContent--alignRight"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "Actions",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="Actions"
+                                      >
+                                        Actions
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                         </tr>
@@ -2866,21 +2873,31 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
             </span>
           </div>
           <EuiText
+            color="default"
             size="s"
           >
             <div
               className="euiText euiText--small"
             >
-              <p>
-                Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
-                <EuiSpacer
-                  size="l"
+              <EuiTextColor
+                color="default"
+                component="div"
+              >
+                <div
+                  className="euiTextColor euiTextColor--default"
                 >
-                  <div
-                    className="euiSpacer euiSpacer--l"
-                  />
-                </EuiSpacer>
-              </p>
+                  <p>
+                    Your destinations have been migrated to Notifications, a new centralized place to manage your notification channels. Destinations will be deprecated going forward.
+                    <EuiSpacer
+                      size="l"
+                    >
+                      <div
+                        className="euiSpacer euiSpacer--l"
+                      />
+                    </EuiSpacer>
+                  </p>
+                </div>
+              </EuiTextColor>
             </div>
           </EuiText>
         </div>
@@ -2910,6 +2927,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
             <EuiIcon
               aria-hidden="true"
               className="euiCallOutHeader__icon"
+              color="inherit"
               size="m"
               type="alert"
             >
@@ -2924,43 +2942,48 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
             </span>
           </div>
           <EuiText
+            color="default"
             size="s"
           >
             <div
               className="euiText euiText--small"
             >
-              <p>
-                Install the notifications plugin in order to create and select channels to send out notifications.
-                 
-                <EuiLink
-                  external={true}
-                  href="#"
+              <EuiTextColor
+                color="default"
+                component="div"
+              >
+                <div
+                  className="euiTextColor euiTextColor--default"
                 >
-                  <a
-                    className="euiLink euiLink--primary"
-                    href="#"
-                    rel="noreferrer"
-                  >
-                    Learn more
-                    <EuiI18n
-                      default="External link"
-                      token="euiLink.external.ariaLabel"
+                  <p>
+                    Install the notifications plugin in order to create and select channels to send out notifications.
+                     
+                    <EuiLink
+                      external={true}
+                      href="#"
                     >
-                      <EuiIcon
-                        aria-label="External link"
-                        className="euiLink__externalIcon"
-                        size="s"
-                        type="popout"
+                      <a
+                        className="euiLink euiLink--primary"
+                        href="#"
+                        rel="noreferrer"
                       >
-                        <div>
-                          EuiIconMock
-                        </div>
-                      </EuiIcon>
-                    </EuiI18n>
-                  </a>
-                </EuiLink>
-                .
-              </p>
+                        Learn more
+                        <EuiIcon
+                          aria-label="External link"
+                          className="euiLink__externalIcon"
+                          size="s"
+                          type="popout"
+                        >
+                          <div>
+                            EuiIconMock
+                          </div>
+                        </EuiIcon>
+                      </a>
+                    </EuiLink>
+                    .
+                  </p>
+                </div>
+              </EuiTextColor>
             </div>
           </EuiText>
         </div>
@@ -2998,7 +3021,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
       }
     >
       <div
-        className="euiPanel euiPanel--paddingMedium"
+        className="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
         style={
           Object {
             "paddingLeft": "0px",
@@ -3197,7 +3220,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                           >
                             <EuiValidatableControl>
                               <input
-                                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                className="euiFieldSearch euiFieldSearch--fullWidth"
                                 onChange={[Function]}
                                 onKeyUp={[Function]}
                                 placeholder="Search"
@@ -3206,6 +3229,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                               />
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon="search"
                               isLoading={false}
                             >
@@ -3213,6 +3237,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 className="euiFormControlLayoutIcons"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="search"
                                 >
                                   <span
@@ -3221,6 +3246,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="search"
                                     >
                                       <div>
@@ -3318,6 +3344,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                               </select>
                             </EuiValidatableControl>
                             <EuiFormControlLayoutIcons
+                              compressed={false}
                               icon={
                                 Object {
                                   "side": "right",
@@ -3330,6 +3357,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 className="euiFormControlLayoutIcons euiFormControlLayoutIcons--right"
                               >
                                 <EuiFormControlLayoutCustomIcon
+                                  size="m"
                                   type="arrowDown"
                                 >
                                   <span
@@ -3338,6 +3366,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                     <EuiIcon
                                       aria-hidden="true"
                                       className="euiFormControlLayoutCustomIcon__icon"
+                                      size="m"
                                       type="arrowDown"
                                     >
                                       <div>
@@ -3401,7 +3430,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                             >
                               <button
                                 aria-label="Previous page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-previous"
                                 disabled={true}
                                 onClick={[Function]}
@@ -3410,6 +3439,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowLeft"
                                 >
@@ -3465,12 +3495,12 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                       data-test-subj="pagination-button-0"
                                       isDisabled={true}
                                       onClick={[Function]}
-                                      size="xs"
+                                      size="s"
                                     >
                                       <button
                                         aria-current={true}
                                         aria-label="Page 1 of 1"
-                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
+                                        className="euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--small euiButtonEmpty-isDisabled euiPaginationButton euiPaginationButton-isActive euiPaginationButton--hideOnMobile"
                                         data-test-subj="pagination-button-0"
                                         disabled={true}
                                         onClick={[Function]}
@@ -3479,6 +3509,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="left"
+                                          iconSize="m"
                                           textProps={
                                             Object {
                                               "className": "euiButtonEmpty__text",
@@ -3526,7 +3557,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                             >
                               <button
                                 aria-label="Next page"
-                                className="euiButtonIcon euiButtonIcon--text"
+                                className="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall"
                                 data-test-subj="pagination-button-next"
                                 disabled={true}
                                 onClick={[Function]}
@@ -3535,6 +3566,7 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 <EuiIcon
                                   aria-hidden="true"
                                   className="euiButtonIcon__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowRight"
                                 >
@@ -3718,73 +3750,65 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                   ownFocus={true}
                                   panelPaddingSize="none"
                                 >
-                                  <EuiOutsideClickDetector
-                                    isDisabled={true}
-                                    onOutsideClick={[Function]}
+                                  <div
+                                    className="euiPopover euiPopover--anchorDownRight"
                                   >
                                     <div
-                                      className="euiPopover euiPopover--anchorDownRight"
-                                      onKeyDown={[Function]}
-                                      onMouseDown={[Function]}
-                                      onMouseUp={[Function]}
-                                      onTouchEnd={[Function]}
-                                      onTouchStart={[Function]}
+                                      className="euiPopover__anchor"
                                     >
-                                      <div
-                                        className="euiPopover__anchor"
+                                      <EuiButtonEmpty
+                                        flush="right"
+                                        iconSide="right"
+                                        iconType="arrowDown"
+                                        onClick={[Function]}
+                                        size="xs"
                                       >
-                                        <EuiButtonEmpty
-                                          flush="right"
-                                          iconSide="right"
-                                          iconType="arrowDown"
+                                        <button
+                                          className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
+                                          disabled={false}
                                           onClick={[Function]}
-                                          size="xs"
+                                          type="button"
                                         >
-                                          <button
-                                            className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushRight"
-                                            disabled={false}
-                                            onClick={[Function]}
-                                            type="button"
-                                          >
-                                            <EuiButtonContent
-                                              className="euiButtonEmpty__content"
-                                              iconSide="right"
-                                              iconType="arrowDown"
-                                              textProps={
-                                                Object {
-                                                  "className": "euiButtonEmpty__text",
-                                                }
+                                          <EuiButtonContent
+                                            className="euiButtonEmpty__content"
+                                            iconSide="right"
+                                            iconSize="s"
+                                            iconType="arrowDown"
+                                            textProps={
+                                              Object {
+                                                "className": "euiButtonEmpty__text",
                                               }
+                                            }
+                                          >
+                                            <span
+                                              className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                                             >
+                                              <EuiIcon
+                                                className="euiButtonContent__icon"
+                                                color="inherit"
+                                                size="s"
+                                                type="arrowDown"
+                                              >
+                                                <div>
+                                                  EuiIconMock
+                                                </div>
+                                              </EuiIcon>
                                               <span
-                                                className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
+                                                className="euiButtonEmpty__text"
                                               >
-                                                <EuiIcon
-                                                  className="euiButtonContent__icon"
-                                                  size="m"
-                                                  type="arrowDown"
-                                                >
-                                                  <div>
-                                                    EuiIconMock
-                                                  </div>
-                                                </EuiIcon>
-                                                <span
-                                                  className="euiButtonEmpty__text"
+                                                <EuiI18n
+                                                  default="Sorting"
+                                                  token="euiTableSortMobile.sorting"
                                                 >
-                                                  <EuiI18n
-                                                    default="Sorting"
-                                                    token="euiTableSortMobile.sorting"
-                                                  >
-                                                    Sorting
-                                                  </EuiI18n>
-                                                </span>
+                                                  Sorting
+                                                </EuiI18n>
                                               </span>
-                                            </EuiButtonContent>
-                                          </button>
-                                        </EuiButtonEmpty>
-                                      </div>
+                                            </span>
+                                          </EuiButtonContent>
+                                        </button>
+                                      </EuiButtonEmpty>
                                     </div>
-                                  </EuiOutsideClickDetector>
+                                  </div>
                                 </EuiPopover>
                               </div>
                             </EuiTableSortMobile>
@@ -3844,39 +3868,35 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSortAscending={false}
+                                  isSorted={true}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "descending",
-                                          "innerText": "Destination name",
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
+                                      <EuiI18n
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Destination name",
+                                          }
                                         }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Destination name; Sorted in descending order"
                                       >
-                                        Destination name
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiI18n
-                                    default="Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.sortedAriaLabel"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "descending",
-                                      }
-                                    }
-                                  >
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Destination name"
+                                        >
+                                          Destination name
+                                        </span>
+                                      </EuiI18n>
+                                    </EuiInnerText>
                                     <EuiIcon
-                                      aria-label="Sorted in descending order"
                                       className="euiTableSortIcon"
                                       size="m"
                                       type="sortDown"
@@ -3885,20 +3905,8 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                         EuiIconMock
                                       </div>
                                     </EuiIcon>
-                                  </EuiI18n>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
-                                      <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
-                                      >
-                                        Click to sort in ascending order
-                                      </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3929,41 +3937,35 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Destination type",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Destination type"
-                                      >
-                                        Destination type
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Destination type",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Destination type"
+                                        >
+                                          Destination type
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -3994,41 +3996,35 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 onClick={[Function]}
                                 type="button"
                               >
-                                <span
+                                <CellContents
                                   className="euiTableCellContent"
+                                  isSorted={false}
+                                  showSortMsg={true}
                                 >
-                                  <EuiInnerText>
-                                    <EuiI18n
-                                      default="{innerText}; Sorted in {ariaSortValue} order"
-                                      token="euiTableHeaderCell.titleTextWithSort"
-                                      values={
-                                        Object {
-                                          "ariaSortValue": "none",
-                                          "innerText": "Last updated by",
-                                        }
-                                      }
-                                    >
-                                      <span
-                                        className="euiTableCellContent__text"
-                                        title="Last updated by"
-                                      >
-                                        Last updated by
-                                      </span>
-                                    </EuiI18n>
-                                  </EuiInnerText>
-                                  <EuiScreenReaderOnly>
-                                    <span
-                                      className="euiScreenReaderOnly"
-                                    >
+                                  <span
+                                    className="euiTableCellContent"
+                                  >
+                                    <EuiInnerText>
                                       <EuiI18n
-                                        default="Click to sort in ascending order"
-                                        token="euiTableHeaderCell.clickForAscending"
+                                        default="{innerText}; {description}"
+                                        token="euiTableHeaderCell.titleTextWithDesc"
+                                        values={
+                                          Object {
+                                            "description": undefined,
+                                            "innerText": "Last updated by",
+                                          }
+                                        }
                                       >
-                                        Click to sort in ascending order
+                                        <span
+                                          className="euiTableCellContent__text"
+                                          title="Last updated by"
+                                        >
+                                          Last updated by
+                                        </span>
                                       </EuiI18n>
-                                    </span>
-                                  </EuiScreenReaderOnly>
-                                </span>
+                                    </EuiInnerText>
+                                  </span>
+                                </CellContents>
                               </button>
                             </th>
                           </EuiTableHeaderCell>
@@ -4047,18 +4043,34 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
                                 }
                               }
                             >
-                              <div
+                              <CellContents
                                 className="euiTableCellContent euiTableCellContent--alignRight"
+                                showSortMsg={false}
                               >
-                                <EuiInnerText>
-                                  <span
-                                    className="euiTableCellContent__text"
-                                    title="Actions"
-                                  >
-                                    Actions
-                                  </span>
-                                </EuiInnerText>
-                              </div>
+                                <span
+                                  className="euiTableCellContent euiTableCellContent--alignRight"
+                                >
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "Actions",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="Actions"
+                                      >
+                                        Actions
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
+                                </span>
+                              </CellContents>
                             </th>
                           </EuiTableHeaderCell>
                         </tr>
diff --git a/public/pages/MonitorDetails/components/MonitorHistory/EmptyHistory/__snapshots__/EmptyHistory.test.js.snap b/public/pages/MonitorDetails/components/MonitorHistory/EmptyHistory/__snapshots__/EmptyHistory.test.js.snap
index 680ee1bf0..b5a7d071c 100644
--- a/public/pages/MonitorDetails/components/MonitorHistory/EmptyHistory/__snapshots__/EmptyHistory.test.js.snap
+++ b/public/pages/MonitorDetails/components/MonitorHistory/EmptyHistory/__snapshots__/EmptyHistory.test.js.snap
@@ -23,9 +23,6 @@ exports[`<EmptyHistory/> renders 1`] = `
   <div
     class="euiSpacer euiSpacer--l"
   />
-  <div
-    class="euiSpacer euiSpacer--s"
-  />
   <button
     class="euiButton euiButton--primary euiButton--fill"
     type="button"
diff --git a/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap b/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
index 71a3418ab..56795047d 100644
--- a/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
+++ b/public/pages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`MonitorOverview renders 1`] = `
 <div
-  class="euiPanel euiPanel--paddingMedium"
+  class="euiPanel euiPanel--paddingMedium euiPanel--borderRadiusMedium euiPanel--plain euiPanel--hasShadow"
   style="padding-left:0px;padding-right:0px"
 >
   <div
diff --git a/public/pages/Monitors/components/MonitorEmptyPrompt/__snapshots__/MonitorEmptyPrompt.test.js.snap b/public/pages/Monitors/components/MonitorEmptyPrompt/__snapshots__/MonitorEmptyPrompt.test.js.snap
index 504cccf65..653f5c33c 100644
--- a/public/pages/Monitors/components/MonitorEmptyPrompt/__snapshots__/MonitorEmptyPrompt.test.js.snap
+++ b/public/pages/Monitors/components/MonitorEmptyPrompt/__snapshots__/MonitorEmptyPrompt.test.js.snap
@@ -23,9 +23,6 @@ exports[`MonitorEmptyPrompt renders 1`] = `
   <div
     class="euiSpacer euiSpacer--l"
   />
-  <div
-    class="euiSpacer euiSpacer--s"
-  />
   <a
     class="euiButton euiButton--primary euiButton--fill"
     href="alerting#/create-monitor"