diff --git a/public/pages/Dashboard/Components/EmptyDashboard/__tests__/__snapshots__/EmptyDashboard.test.tsx.snap b/public/pages/Dashboard/Components/EmptyDashboard/__tests__/__snapshots__/EmptyDashboard.test.tsx.snap
index ab36463b..48f50f56 100644
--- a/public/pages/Dashboard/Components/EmptyDashboard/__tests__/__snapshots__/EmptyDashboard.test.tsx.snap
+++ b/public/pages/Dashboard/Components/EmptyDashboard/__tests__/__snapshots__/EmptyDashboard.test.tsx.snap
@@ -35,18 +35,13 @@ exports[`<EmptyDetector /> spec Empty results renders component with empty messa
         >
           Get started with Anomaly detection  
           <svg
-            class="euiIcon euiIcon--small"
+            class="euiIcon euiIcon--small euiIcon-isLoading"
             focusable="false"
             height="16"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M2 14.01h12.49a.5.5 0 1 1 0 1h-13a.5.5 0 0 1-.49-.597V1.5a.5.5 0 0 1 1 0v12.51zm2.354-1.656a.5.5 0 0 1-.708-.708l8-8a.5.5 0 0 1 .708.708l-8 8zM15 5.5a.5.5 0 1 1-1 0v-3a.5.5 0 0 0-.5-.5h-3a.5.5 0 1 1 0-1h3A1.5 1.5 0 0 1 15 2.5v3z"
-              fill-rule="evenodd"
-            />
-          </svg>
+          />
         </a>
          
       </p>
@@ -62,6 +57,7 @@ exports[`<EmptyDetector /> spec Empty results renders component with empty messa
     class="euiButton euiButton--primary euiButton--fill"
     data-test-subj="add_detector"
     href="opendistro-anomaly-detection#/create-ad/"
+    rel="noreferrer"
   >
     <span
       class="euiButton__content"
diff --git a/public/pages/DetectorDetail/components/ConfirmModal/__tests__/__snapshots__/ConfirmModal.test.tsx.snap b/public/pages/DetectorDetail/components/ConfirmModal/__tests__/__snapshots__/ConfirmModal.test.tsx.snap
index a75e6f04..7532b965 100644
--- a/public/pages/DetectorDetail/components/ConfirmModal/__tests__/__snapshots__/ConfirmModal.test.tsx.snap
+++ b/public/pages/DetectorDetail/components/ConfirmModal/__tests__/__snapshots__/ConfirmModal.test.tsx.snap
@@ -2,7 +2,19 @@
 
 exports[`<ConfirmModal /> spec Confirm Modal renders component with callout 1`] = `
 <div>
-  <div>
+  <div
+    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"
+    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 euiModal--maxWidth-default"
       tabindex="0"
@@ -14,17 +26,13 @@ exports[`<ConfirmModal /> spec Confirm Modal renders component with callout 1`]
       >
         <svg
           aria-hidden="true"
-          class="euiIcon euiIcon--medium euiButtonIcon__icon"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z"
-          />
-        </svg>
+        />
       </button>
       <div
         class="euiModal__flex"
@@ -43,22 +51,26 @@ exports[`<ConfirmModal /> spec Confirm Modal renders component with callout 1`]
           style="padding-left: 24px; padding-right: 24px;"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
+            class="euiModalBody__overflow"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
-            >
-              test callout
-            </div>
-            <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
             >
               <div
-                class="euiText euiText--medium"
+                class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <p>
-                  this is a testing description
-                </p>
+                test callout
+              </div>
+              <div
+                class="euiFlexItem euiFlexItem--flexGrowZero"
+              >
+                <div
+                  class="euiText euiText--medium"
+                >
+                  <p>
+                    this is a testing description
+                  </p>
+                </div>
               </div>
             </div>
           </div>
@@ -96,12 +108,29 @@ exports[`<ConfirmModal /> spec Confirm Modal renders component with callout 1`]
       </div>
     </div>
   </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
 </div>
 `;
 
 exports[`<ConfirmModal /> spec Confirm Modal renders component with empty callout 1`] = `
 <div>
-  <div>
+  <div
+    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"
+    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 euiModal--maxWidth-default"
       tabindex="0"
@@ -113,17 +142,13 @@ exports[`<ConfirmModal /> spec Confirm Modal renders component with empty callou
       >
         <svg
           aria-hidden="true"
-          class="euiIcon euiIcon--medium euiButtonIcon__icon"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M7.293 8L3.146 3.854a.5.5 0 1 1 .708-.708L8 7.293l4.146-4.147a.5.5 0 0 1 .708.708L8.707 8l4.147 4.146a.5.5 0 0 1-.708.708L8 8.707l-4.146 4.147a.5.5 0 0 1-.708-.708L7.293 8z"
-          />
-        </svg>
+        />
       </button>
       <div
         class="euiModal__flex"
@@ -142,17 +167,21 @@ exports[`<ConfirmModal /> spec Confirm Modal renders component with empty callou
           style="padding-left: 24px; padding-right: 24px;"
         >
           <div
-            class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
+            class="euiModalBody__overflow"
           >
             <div
-              class="euiFlexItem euiFlexItem--flexGrowZero"
+              class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--directionColumn euiFlexGroup--responsive"
             >
               <div
-                class="euiText euiText--medium"
+                class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <p>
-                  this is a testing description
-                </p>
+                <div
+                  class="euiText euiText--medium"
+                >
+                  <p>
+                    this is a testing description
+                  </p>
+                </div>
               </div>
             </div>
           </div>
@@ -190,5 +219,10 @@ exports[`<ConfirmModal /> spec Confirm Modal renders component with empty callou
       </div>
     </div>
   </div>
+  <div
+    data-focus-guard="true"
+    style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
+    tabindex="0"
+  />
 </div>
 `;
diff --git a/public/pages/DetectorDetail/components/DetectorControls/__tests__/__snapshots__/DetectorControls.test.tsx.snap b/public/pages/DetectorDetail/components/DetectorControls/__tests__/__snapshots__/DetectorControls.test.tsx.snap
index fbf08779..6648614f 100644
--- a/public/pages/DetectorDetail/components/DetectorControls/__tests__/__snapshots__/DetectorControls.test.tsx.snap
+++ b/public/pages/DetectorDetail/components/DetectorControls/__tests__/__snapshots__/DetectorControls.test.tsx.snap
@@ -25,25 +25,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
             >
               <svg
                 aria-hidden="true"
-                class="euiIcon euiIcon--medium euiButton__icon"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
                 focusable="false"
                 height="16"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-              >
-                <defs>
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                    id="arrow_down-a"
-                  />
-                </defs>
-                <use
-                  fill-rule="nonzero"
-                  xlink:href="#arrow_down-a"
-                />
-              </svg>
+              />
               <span
                 class="euiButton__text"
               >
@@ -68,17 +56,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
         >
           <svg
             aria-hidden="true"
-            class="euiIcon euiIcon--medium euiButton__icon"
+            class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
             focusable="false"
             height="16"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4.608 3.063C4.345 2.895 4 3.089 4 3.418v9.167c0 .329.345.523.608.356l7.2-4.584a.426.426 0 0 0 0-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 0 1 0 2.399l-7.2 4.583C4.21 14.38 3 13.696 3 12.585V3.418C3 2.307 4.21 1.624 5.146 2.22z"
-            />
-          </svg>
+          />
           <span
             class="euiButton__text"
           >
@@ -116,25 +100,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
             >
               <svg
                 aria-hidden="true"
-                class="euiIcon euiIcon--medium euiButton__icon"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
                 focusable="false"
                 height="16"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-              >
-                <defs>
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                    id="arrow_down-a"
-                  />
-                </defs>
-                <use
-                  fill-rule="nonzero"
-                  xlink:href="#arrow_down-a"
-                />
-              </svg>
+              />
               <span
                 class="euiButton__text"
               >
@@ -158,17 +130,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
         >
           <svg
             aria-hidden="true"
-            class="euiIcon euiIcon--medium euiButton__icon"
+            class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
             focusable="false"
             height="16"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4.608 3.063C4.345 2.895 4 3.089 4 3.418v9.167c0 .329.345.523.608.356l7.2-4.584a.426.426 0 0 0 0-.711l-7.2-4.583zm.538-.844l7.2 4.583a1.426 1.426 0 0 1 0 2.399l-7.2 4.583C4.21 14.38 3 13.696 3 12.585V3.418C3 2.307 4.21 1.624 5.146 2.22z"
-            />
-          </svg>
+          />
           <span
             class="euiButton__text"
           >
@@ -206,25 +174,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
             >
               <svg
                 aria-hidden="true"
-                class="euiIcon euiIcon--medium euiButton__icon"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
                 focusable="false"
                 height="16"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-              >
-                <defs>
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                    id="arrow_down-a"
-                  />
-                </defs>
-                <use
-                  fill-rule="nonzero"
-                  xlink:href="#arrow_down-a"
-                />
-              </svg>
+              />
               <span
                 class="euiButton__text"
               >
@@ -249,18 +205,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
         >
           <svg
             aria-hidden="true"
-            class="euiIcon euiIcon--medium euiButton__icon"
+            class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
             focusable="false"
             height="16"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2zm0 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4z"
-              fill-rule="evenodd"
-            />
-          </svg>
+          />
           <span
             class="euiButton__text"
           >
@@ -298,25 +249,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
             >
               <svg
                 aria-hidden="true"
-                class="euiIcon euiIcon--medium euiButton__icon"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
                 focusable="false"
                 height="16"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-              >
-                <defs>
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                    id="arrow_down-a"
-                  />
-                </defs>
-                <use
-                  fill-rule="nonzero"
-                  xlink:href="#arrow_down-a"
-                />
-              </svg>
+              />
               <span
                 class="euiButton__text"
               >
@@ -340,18 +279,13 @@ exports[`<DetectorControls /> spec Detector Controls renders detector controls w
         >
           <svg
             aria-hidden="true"
-            class="euiIcon euiIcon--medium euiButton__icon"
+            class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
             focusable="false"
             height="16"
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M4 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2zm0 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4z"
-              fill-rule="evenodd"
-            />
-          </svg>
+          />
           <span
             class="euiButton__text"
           >
diff --git a/public/pages/DetectorDetail/components/MonitorCallout/__tests__/__snapshots__/MonitorCallout.test.tsx.snap b/public/pages/DetectorDetail/components/MonitorCallout/__tests__/__snapshots__/MonitorCallout.test.tsx.snap
index 16643d56..776e476b 100644
--- a/public/pages/DetectorDetail/components/MonitorCallout/__tests__/__snapshots__/MonitorCallout.test.tsx.snap
+++ b/public/pages/DetectorDetail/components/MonitorCallout/__tests__/__snapshots__/MonitorCallout.test.tsx.snap
@@ -9,18 +9,13 @@ exports[`<MonitorCallout /> spec Monitor callout renders component 1`] = `
   >
     <svg
       aria-hidden="true"
-      class="euiIcon euiIcon--medium euiCallOutHeader__icon"
+      class="euiIcon euiIcon--medium euiIcon-isLoading euiCallOutHeader__icon"
       focusable="false"
       height="16"
       viewBox="0 0 16 16"
       width="16"
       xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M8.378 1.496l6.695 10.984A1 1 0 0 1 14.22 14H1.667a1 1 0 0 1-.883-1.47L6.642 1.545a1 1 0 0 1 1.736-.05zm-.853.52L1.667 13h12.552L7.525 2.016zM7.14 10.06L6.9 5.18h1.3l-.25 4.878h-.81zm.394 1.901a.61.61 0 0 1-.448-.186.606.606 0 0 1-.186-.444c0-.174.062-.323.186-.446a.614.614 0 0 1 .448-.184c.169 0 .315.06.44.182.124.122.186.27.186.448a.6.6 0 0 1-.189.446.607.607 0 0 1-.437.184z"
-        fill-rule="evenodd"
-      />
-    </svg>
+    />
     <span
       class="euiCallOutHeader__title"
     >
@@ -42,18 +37,13 @@ exports[`<MonitorCallout /> spec Monitor callout renders component 1`] = `
         test-monitor
          
         <svg
-          class="euiIcon euiIcon--small"
+          class="euiIcon euiIcon--small euiIcon-isLoading"
           focusable="false"
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M2 14.01h12.49a.5.5 0 1 1 0 1h-13a.5.5 0 0 1-.49-.597V1.5a.5.5 0 0 1 1 0v12.51zm2.354-1.656a.5.5 0 0 1-.708-.708l8-8a.5.5 0 0 1 .708.708l-8 8zM15 5.5a.5.5 0 1 1-1 0v-3a.5.5 0 0 0-.5-.5h-3a.5.5 0 1 1 0-1h3A1.5 1.5 0 0 1 15 2.5v3z"
-            fill-rule="evenodd"
-          />
-        </svg>
+        />
       </a>
        
       associated with this detector will not receive any anomaly results to generate alerts.
diff --git a/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap b/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap
index 95fdccca..0bfa979d 100644
--- a/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap
+++ b/public/pages/DetectorDetail/containers/__tests__/__snapshots__/DetectorDetail.test.tsx.snap
@@ -28,26 +28,13 @@ exports[`<DetectorDetail /> spec detector detail renders detector detail compone
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
                 <svg
-                  class="euiIcon euiIcon--medium euiIcon--success"
+                  class="euiIcon euiIcon--medium euiIcon--success euiIcon-isLoading"
                   focusable="false"
                   height="16"
                   viewBox="0 0 16 16"
                   width="16"
                   xmlns="http://www.w3.org/2000/svg"
-                  xmlns:xlink="http://www.w3.org/1999/xlink"
-                >
-                  <defs>
-                    <circle
-                      cx="8"
-                      cy="8"
-                      id="dot-a"
-                      r="4"
-                    />
-                  </defs>
-                  <use
-                    xlink:href="#dot-a"
-                  />
-                </svg>
+                />
               </div>
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -86,25 +73,13 @@ exports[`<DetectorDetail /> spec detector detail renders detector detail compone
                   >
                     <svg
                       aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiButton__icon"
+                      class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
                       focusable="false"
                       height="16"
                       viewBox="0 0 16 16"
                       width="16"
                       xmlns="http://www.w3.org/2000/svg"
-                      xmlns:xlink="http://www.w3.org/1999/xlink"
-                    >
-                      <defs>
-                        <path
-                          d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                          id="arrow_down-a"
-                        />
-                      </defs>
-                      <use
-                        fill-rule="nonzero"
-                        xlink:href="#arrow_down-a"
-                      />
-                    </svg>
+                    />
                     <span
                       class="euiButton__text"
                     >
@@ -128,18 +103,13 @@ exports[`<DetectorDetail /> spec detector detail renders detector detail compone
               >
                 <svg
                   aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiButton__icon"
+                  class="euiIcon euiIcon--medium euiIcon-isLoading euiButton__icon"
                   focusable="false"
                   height="16"
                   viewBox="0 0 16 16"
                   width="16"
                   xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    d="M4 2h8a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2zm0 1a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1H4z"
-                    fill-rule="evenodd"
-                  />
-                </svg>
+                />
                 <span
                   class="euiButton__text"
                 >
diff --git a/public/pages/DetectorResults/components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap b/public/pages/DetectorResults/components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap
index b33e812a..ab4792cb 100644
--- a/public/pages/DetectorResults/components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap
+++ b/public/pages/DetectorResults/components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap
@@ -21,26 +21,13 @@ exports[`<ListControls /> spec Empty results renders component with empty messag
       >
         <svg
           aria-hidden="true"
-          class="euiIcon euiIcon--medium euiButtonIcon__icon"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-        >
-          <defs>
-            <path
-              d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-              id="arrow_left-a"
-            />
-          </defs>
-          <use
-            fill-rule="nonzero"
-            transform="rotate(90 8 8)"
-            xlink:href="#arrow_left-a"
-          />
-        </svg>
+        />
       </button>
       <button
         aria-label="Page 1 of 5"
@@ -163,26 +150,13 @@ exports[`<ListControls /> spec Empty results renders component with empty messag
       >
         <svg
           aria-hidden="true"
-          class="euiIcon euiIcon--medium euiButtonIcon__icon"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-        >
-          <defs>
-            <path
-              d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-              id="arrow_right-a"
-            />
-          </defs>
-          <use
-            fill-rule="nonzero"
-            transform="matrix(0 1 1 0 0 0)"
-            xlink:href="#arrow_right-a"
-          />
-        </svg>
+        />
       </button>
     </div>
   </div>
diff --git a/public/pages/DetectorsList/Components/EmptyMessage/__tests__/__snapshots__/EmptyMessage.test.tsx.snap b/public/pages/DetectorsList/Components/EmptyMessage/__tests__/__snapshots__/EmptyMessage.test.tsx.snap
index ce266ed3..47f49e7b 100644
--- a/public/pages/DetectorsList/Components/EmptyMessage/__tests__/__snapshots__/EmptyMessage.test.tsx.snap
+++ b/public/pages/DetectorsList/Components/EmptyMessage/__tests__/__snapshots__/EmptyMessage.test.tsx.snap
@@ -30,6 +30,7 @@ exports[`<EmptyDetectorMessage /> spec Empty results renders component with empt
     class="euiButton euiButton--primary euiButton--fill"
     data-test-subj="add_detector"
     href="opendistro-anomaly-detection#/create-ad/"
+    rel="noreferrer"
   >
     <span
       class="euiButton__content"
diff --git a/public/pages/DetectorsList/Components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap b/public/pages/DetectorsList/Components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap
index fc454c21..0637f113 100644
--- a/public/pages/DetectorsList/Components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap
+++ b/public/pages/DetectorsList/Components/ListControls/__tests__/__snapshots__/ListControls.test.tsx.snap
@@ -29,24 +29,13 @@ exports[`<ListControls /> spec Empty results renders component with empty messag
           >
             <svg
               aria-hidden="true"
-              class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+              class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
               focusable="false"
               height="16"
               viewBox="0 0 16 16"
               width="16"
               xmlns="http://www.w3.org/2000/svg"
-              xmlns:xlink="http://www.w3.org/1999/xlink"
-            >
-              <defs>
-                <path
-                  d="M11.271 11.978l3.872 3.873a.502.502 0 0 0 .708 0 .502.502 0 0 0 0-.708l-3.565-3.564c2.38-2.747 2.267-6.923-.342-9.532-2.73-2.73-7.17-2.73-9.898 0-2.728 2.729-2.728 7.17 0 9.9a6.955 6.955 0 0 0 4.949 2.05.5.5 0 0 0 0-1 5.96 5.96 0 0 1-4.242-1.757 6.01 6.01 0 0 1 0-8.486c2.337-2.34 6.143-2.34 8.484 0a6.01 6.01 0 0 1 0 8.486.5.5 0 0 0 .034.738z"
-                  id="search-a"
-                />
-              </defs>
-              <use
-                xlink:href="#search-a"
-              />
-            </svg>
+            />
           </span>
         </div>
       </div>
@@ -100,28 +89,17 @@ exports[`<ListControls /> spec Empty results renders component with empty messag
               aria-label="Open list of options"
               class="euiFormControlLayoutCustomIcon euiFormControlLayoutCustomIcon--clickable"
               data-test-subj="comboBoxToggleListButton"
+              type="button"
             >
               <svg
                 aria-hidden="true"
-                class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                 focusable="false"
                 height="16"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-              >
-                <defs>
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                    id="arrow_down-a"
-                  />
-                </defs>
-                <use
-                  fill-rule="nonzero"
-                  xlink:href="#arrow_down-a"
-                />
-              </svg>
+              />
             </button>
           </div>
         </div>
@@ -176,28 +154,17 @@ exports[`<ListControls /> spec Empty results renders component with empty messag
               aria-label="Open list of options"
               class="euiFormControlLayoutCustomIcon euiFormControlLayoutCustomIcon--clickable"
               data-test-subj="comboBoxToggleListButton"
+              type="button"
             >
               <svg
                 aria-hidden="true"
-                class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                 focusable="false"
                 height="16"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-              >
-                <defs>
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                    id="arrow_down-a"
-                  />
-                </defs>
-                <use
-                  fill-rule="nonzero"
-                  xlink:href="#arrow_down-a"
-                />
-              </svg>
+              />
             </button>
           </div>
         </div>
@@ -220,26 +187,13 @@ exports[`<ListControls /> spec Empty results renders component with empty messag
       >
         <svg
           aria-hidden="true"
-          class="euiIcon euiIcon--medium euiButtonIcon__icon"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-        >
-          <defs>
-            <path
-              d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-              id="arrow_left-a"
-            />
-          </defs>
-          <use
-            fill-rule="nonzero"
-            transform="rotate(90 8 8)"
-            xlink:href="#arrow_left-a"
-          />
-        </svg>
+        />
       </button>
       <button
         aria-label="Page 1 of 5"
@@ -362,26 +316,13 @@ exports[`<ListControls /> spec Empty results renders component with empty messag
       >
         <svg
           aria-hidden="true"
-          class="euiIcon euiIcon--medium euiButtonIcon__icon"
+          class="euiIcon euiIcon--medium euiIcon-isLoading euiButtonIcon__icon"
           focusable="false"
           height="16"
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-        >
-          <defs>
-            <path
-              d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-              id="arrow_right-a"
-            />
-          </defs>
-          <use
-            fill-rule="nonzero"
-            transform="matrix(0 1 1 0 0 0)"
-            xlink:href="#arrow_right-a"
-          />
-        </svg>
+        />
       </button>
     </div>
   </div>
diff --git a/public/pages/PreviewDetector/components/AggregationSelector/__tests__/__snapshots__/AggregationSelectior.test.tsx.snap b/public/pages/PreviewDetector/components/AggregationSelector/__tests__/__snapshots__/AggregationSelectior.test.tsx.snap
index 65da476c..206a22a3 100644
--- a/public/pages/PreviewDetector/components/AggregationSelector/__tests__/__snapshots__/AggregationSelectior.test.tsx.snap
+++ b/public/pages/PreviewDetector/components/AggregationSelector/__tests__/__snapshots__/AggregationSelectior.test.tsx.snap
@@ -7,13 +7,15 @@ exports[`<AggregationSelector /> spec Empty results renders component with aggre
       class="euiFormRow"
       id="random_id-row"
     >
-      <label
-        aria-invalid="false"
-        class="euiFormLabel"
-        for="random_id"
-      >
-        Aggregation by
-      </label>
+      <div>
+        <label
+          aria-invalid="false"
+          class="euiFormLabel"
+          for="random_id"
+        >
+          Aggregation by
+        </label>
+      </div>
       <div
         class="euiFormControlLayout"
       >
@@ -57,25 +59,13 @@ exports[`<AggregationSelector /> spec Empty results renders component with aggre
             >
               <svg
                 aria-hidden="true"
-                class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                 focusable="false"
                 height="16"
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-              >
-                <defs>
-                  <path
-                    d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                    id="arrow_down-a"
-                  />
-                </defs>
-                <use
-                  fill-rule="nonzero"
-                  xlink:href="#arrow_down-a"
-                />
-              </svg>
+              />
             </span>
           </div>
         </div>
@@ -91,13 +81,15 @@ exports[`<AggregationSelector /> spec Empty results renders component with aggre
       class="euiFormRow"
       id="random_id-row"
     >
-      <label
-        aria-invalid="false"
-        class="euiFormLabel"
-        for="random_id"
-      >
-        Field
-      </label>
+      <div>
+        <label
+          aria-invalid="false"
+          class="euiFormLabel"
+          for="random_id"
+        >
+          Field
+        </label>
+      </div>
       <div
         aria-expanded="false"
         aria-haspopup="listbox"
@@ -140,28 +132,17 @@ exports[`<AggregationSelector /> spec Empty results renders component with aggre
                 aria-label="Open list of options"
                 class="euiFormControlLayoutCustomIcon euiFormControlLayoutCustomIcon--clickable"
                 data-test-subj="comboBoxToggleListButton"
+                type="button"
               >
                 <svg
                   aria-hidden="true"
-                  class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                  class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                   focusable="false"
                   height="16"
                   viewBox="0 0 16 16"
                   width="16"
                   xmlns="http://www.w3.org/2000/svg"
-                  xmlns:xlink="http://www.w3.org/1999/xlink"
-                >
-                  <defs>
-                    <path
-                      d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                      id="arrow_down-a"
-                    />
-                  </defs>
-                  <use
-                    fill-rule="nonzero"
-                    xlink:href="#arrow_down-a"
-                  />
-                </svg>
+                />
               </button>
             </div>
           </div>
diff --git a/public/pages/PreviewDetector/components/CustomAggregation/__tests__/__snapshots__/CustomAggregation.test.tsx.snap b/public/pages/PreviewDetector/components/CustomAggregation/__tests__/__snapshots__/CustomAggregation.test.tsx.snap
index 118887a3..4fc67e30 100644
--- a/public/pages/PreviewDetector/components/CustomAggregation/__tests__/__snapshots__/CustomAggregation.test.tsx.snap
+++ b/public/pages/PreviewDetector/components/CustomAggregation/__tests__/__snapshots__/CustomAggregation.test.tsx.snap
@@ -6,13 +6,15 @@ exports[`<CustomAggregation /> spec renders the component 1`] = `
     class="euiFormRow euiFormRow--fullWidth"
     id="random_id-row"
   >
-    <label
-      aria-invalid="false"
-      class="euiFormLabel"
-      for="random_id"
-    >
-      Expression
-    </label>
+    <div>
+      <label
+        aria-invalid="false"
+        class="euiFormLabel"
+        for="random_id"
+      >
+        Expression
+      </label>
+    </div>
     <div
       class="euiCodeEditorWrapper"
       data-test-subj="codeEditorContainer"
diff --git a/public/pages/createDetector/components/Datasource/__tests__/__snapshots__/IndexOption.test.tsx.snap b/public/pages/createDetector/components/Datasource/__tests__/__snapshots__/IndexOption.test.tsx.snap
index dee7ef92..9499e538 100644
--- a/public/pages/createDetector/components/Datasource/__tests__/__snapshots__/IndexOption.test.tsx.snap
+++ b/public/pages/createDetector/components/Datasource/__tests__/__snapshots__/IndexOption.test.tsx.snap
@@ -11,26 +11,13 @@ exports[`<IndexOptions /> spec renders the component 1`] = `
       class="euiFlexItem euiFlexItem--flexGrowZero"
     >
       <svg
-        class="euiIcon euiIcon--medium euiIcon--success"
+        class="euiIcon euiIcon--medium euiIcon--success euiIcon-isLoading"
         focusable="false"
         height="16"
         viewBox="0 0 16 16"
         width="16"
         xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-      >
-        <defs>
-          <circle
-            cx="8"
-            cy="8"
-            id="dot-a"
-            r="4"
-          />
-        </defs>
-        <use
-          xlink:href="#dot-a"
-        />
-      </svg>
+      />
     </div>
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
@@ -58,26 +45,13 @@ exports[`<IndexOptions /> spec renders with highlight 1`] = `
       class="euiFlexItem euiFlexItem--flexGrowZero"
     >
       <svg
-        class="euiIcon euiIcon--medium euiIcon--success"
+        class="euiIcon euiIcon--medium euiIcon--success euiIcon-isLoading"
         focusable="false"
         height="16"
         viewBox="0 0 16 16"
         width="16"
         xmlns="http://www.w3.org/2000/svg"
-        xmlns:xlink="http://www.w3.org/1999/xlink"
-      >
-        <defs>
-          <circle
-            cx="8"
-            cy="8"
-            id="dot-a"
-            r="4"
-          />
-        </defs>
-        <use
-          xlink:href="#dot-a"
-        />
-      </svg>
+      />
     </div>
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
diff --git a/public/pages/createDetector/components/DetectorInfo/__tests__/__snapshots__/DetectorInfo.test.tsx.snap b/public/pages/createDetector/components/DetectorInfo/__tests__/__snapshots__/DetectorInfo.test.tsx.snap
index 59cbe094..c4a36374 100644
--- a/public/pages/createDetector/components/DetectorInfo/__tests__/__snapshots__/DetectorInfo.test.tsx.snap
+++ b/public/pages/createDetector/components/DetectorInfo/__tests__/__snapshots__/DetectorInfo.test.tsx.snap
@@ -50,25 +50,27 @@ exports[`<DetectorInfo /> spec renders the component 1`] = `
         id="random_id-row"
         title="Name"
       >
-        <label
-          aria-invalid="false"
-          class="euiFormLabel"
-          for="random_id"
-        >
-          <div
-            style="line-height: 8px;"
+        <div>
+          <label
+            aria-invalid="false"
+            class="euiFormLabel"
+            for="random_id"
           >
-            <p>
-              Name
-            </p>
-            <br />
-            <p
-              class="sublabel"
+            <div
+              style="line-height: 8px;"
             >
-              Specify a unique and descriptive name that is easy to recognize.
-            </p>
-          </div>
-        </label>
+              <p>
+                Name
+              </p>
+              <br />
+              <p
+                class="sublabel"
+              >
+                Specify a unique and descriptive name that is easy to recognize.
+              </p>
+            </div>
+          </label>
+        </div>
         <div
           class="euiFormControlLayout"
         >
@@ -92,30 +94,32 @@ exports[`<DetectorInfo /> spec renders the component 1`] = `
         hint="Describe the purpose of the detector."
         id="random_id-row"
       >
-        <label
-          aria-invalid="false"
-          class="euiFormLabel"
-          for="random_id"
-        >
-          <div
-            style="line-height: 8px;"
+        <div>
+          <label
+            aria-invalid="false"
+            class="euiFormLabel"
+            for="random_id"
           >
-            <p>
-              Description 
-              <span
-                class="optional"
-              >
-                - optional
-              </span>
-            </p>
-            <br />
-            <p
-              class="sublabel"
+            <div
+              style="line-height: 8px;"
             >
-              Describe the purpose of the detector.
-            </p>
-          </div>
-        </label>
+              <p>
+                Description 
+                <span
+                  class="optional"
+                >
+                  - optional
+                </span>
+              </p>
+              <br />
+              <p
+                class="sublabel"
+              >
+                Describe the purpose of the detector.
+              </p>
+            </div>
+          </label>
+        </div>
         <textarea
           class="euiTextArea euiTextArea--resizeVertical"
           id="random_id"
diff --git a/public/pages/createDetector/containers/__tests__/__snapshots__/CreateDetector.test.tsx.snap b/public/pages/createDetector/containers/__tests__/__snapshots__/CreateDetector.test.tsx.snap
index 58047163..3dba8584 100644
--- a/public/pages/createDetector/containers/__tests__/__snapshots__/CreateDetector.test.tsx.snap
+++ b/public/pages/createDetector/containers/__tests__/__snapshots__/CreateDetector.test.tsx.snap
@@ -69,25 +69,27 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
           id="random_id-row"
           title="Name"
         >
-          <label
-            aria-invalid="false"
-            class="euiFormLabel"
-            for="random_id"
-          >
-            <div
-              style="line-height: 8px;"
+          <div>
+            <label
+              aria-invalid="false"
+              class="euiFormLabel"
+              for="random_id"
             >
-              <p>
-                Name
-              </p>
-              <br />
-              <p
-                class="sublabel"
+              <div
+                style="line-height: 8px;"
               >
-                Specify a unique and descriptive name that is easy to recognize.
-              </p>
-            </div>
-          </label>
+                <p>
+                  Name
+                </p>
+                <br />
+                <p
+                  class="sublabel"
+                >
+                  Specify a unique and descriptive name that is easy to recognize.
+                </p>
+              </div>
+            </label>
+          </div>
           <div
             class="euiFormControlLayout"
           >
@@ -111,30 +113,32 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
           hint="Describe the purpose of the detector."
           id="random_id-row"
         >
-          <label
-            aria-invalid="false"
-            class="euiFormLabel"
-            for="random_id"
-          >
-            <div
-              style="line-height: 8px;"
+          <div>
+            <label
+              aria-invalid="false"
+              class="euiFormLabel"
+              for="random_id"
             >
-              <p>
-                Description 
-                <span
-                  class="optional"
-                >
-                  - optional
-                </span>
-              </p>
-              <br />
-              <p
-                class="sublabel"
+              <div
+                style="line-height: 8px;"
               >
-                Describe the purpose of the detector.
-              </p>
-            </div>
-          </label>
+                <p>
+                  Description 
+                  <span
+                    class="optional"
+                  >
+                    - optional
+                  </span>
+                </p>
+                <br />
+                <p
+                  class="sublabel"
+                >
+                  Describe the purpose of the detector.
+                </p>
+              </div>
+            </label>
+          </div>
           <textarea
             class="euiTextArea euiTextArea--resizeVertical"
             id="random_id"
@@ -196,25 +200,27 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
           id="random_id-row"
           title="Index"
         >
-          <label
-            aria-invalid="false"
-            class="euiFormLabel"
-            for="random_id"
-          >
-            <div
-              style="line-height: 8px;"
+          <div>
+            <label
+              aria-invalid="false"
+              class="euiFormLabel"
+              for="random_id"
             >
-              <p>
-                Index
-              </p>
-              <br />
-              <p
-                class="sublabel"
+              <div
+                style="line-height: 8px;"
               >
-                Choose an index or index pattern as the data source.
-              </p>
-            </div>
-          </label>
+                <p>
+                  Index
+                </p>
+                <br />
+                <p
+                  class="sublabel"
+                >
+                  Choose an index or index pattern as the data source.
+                </p>
+              </div>
+            </label>
+          </div>
           <div
             aria-describedby="random_id-help"
             aria-expanded="false"
@@ -261,28 +267,17 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
                     aria-label="Open list of options"
                     class="euiFormControlLayoutCustomIcon euiFormControlLayoutCustomIcon--clickable"
                     data-test-subj="comboBoxToggleListButton"
+                    type="button"
                   >
                     <svg
                       aria-hidden="true"
-                      class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                      class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                       focusable="false"
                       height="16"
                       viewBox="0 0 16 16"
                       width="16"
                       xmlns="http://www.w3.org/2000/svg"
-                      xmlns:xlink="http://www.w3.org/1999/xlink"
-                    >
-                      <defs>
-                        <path
-                          d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                          id="arrow_down-a"
-                        />
-                      </defs>
-                      <use
-                        fill-rule="nonzero"
-                        xlink:href="#arrow_down-a"
-                      />
-                    </svg>
+                    />
                   </button>
                 </div>
               </div>
@@ -301,25 +296,27 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
           id="random_id-row"
           title="Timestamp field"
         >
-          <label
-            aria-invalid="false"
-            class="euiFormLabel"
-            for="random_id"
-          >
-            <div
-              style="line-height: 8px;"
+          <div>
+            <label
+              aria-invalid="false"
+              class="euiFormLabel"
+              for="random_id"
             >
-              <p>
-                Timestamp field
-              </p>
-              <br />
-              <p
-                class="sublabel"
+              <div
+                style="line-height: 8px;"
               >
-                Choose the time field you want to use for time filter.
-              </p>
-            </div>
-          </label>
+                <p>
+                  Timestamp field
+                </p>
+                <br />
+                <p
+                  class="sublabel"
+                >
+                  Choose the time field you want to use for time filter.
+                </p>
+              </div>
+            </label>
+          </div>
           <div
             class="euiFormControlLayout"
           >
@@ -344,25 +341,13 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                    class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                     focusable="false"
                     height="16"
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                    xmlns:xlink="http://www.w3.org/1999/xlink"
-                  >
-                    <defs>
-                      <path
-                        d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                        id="arrow_down-a"
-                      />
-                    </defs>
-                    <use
-                      fill-rule="nonzero"
-                      xlink:href="#arrow_down-a"
-                    />
-                  </svg>
+                  />
                 </span>
               </div>
             </div>
@@ -374,35 +359,37 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
           hint="Choose a subset of your data source to focus your data stream and reduce noisy data.,Use the visual editor to create a simple filter, or use the Elasticsearch query DSL to create more advanced filters."
           id="random_id-row"
         >
-          <label
-            aria-invalid="false"
-            class="euiFormLabel"
-            for="random_id"
-          >
-            <div
-              style="line-height: 8px;"
+          <div>
+            <label
+              aria-invalid="false"
+              class="euiFormLabel"
+              for="random_id"
             >
-              <p>
-                Data fiter
-                <span
-                  class="optional"
-                >
-                  - optional
-                </span>
-              </p>
-              <br />
-              <p
-                class="sublabel"
-              >
-                Choose a subset of your data source to focus your data stream and reduce noisy data.
-              </p>
-              <p
-                class="sublabel"
+              <div
+                style="line-height: 8px;"
               >
-                Use the visual editor to create a simple filter, or use the Elasticsearch query DSL to create more advanced filters.
-              </p>
-            </div>
-          </label>
+                <p>
+                  Data fiter
+                  <span
+                    class="optional"
+                  >
+                    - optional
+                  </span>
+                </p>
+                <br />
+                <p
+                  class="sublabel"
+                >
+                  Choose a subset of your data source to focus your data stream and reduce noisy data.
+                </p>
+                <p
+                  class="sublabel"
+                >
+                  Use the visual editor to create a simple filter, or use the Elasticsearch query DSL to create more advanced filters.
+                </p>
+              </div>
+            </label>
+          </div>
           <div
             class="euiFormControlLayout"
           >
@@ -433,25 +420,13 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
                 >
                   <svg
                     aria-hidden="true"
-                    class="euiIcon euiIcon--medium euiFormControlLayoutCustomIcon__icon"
+                    class="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                     focusable="false"
                     height="16"
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                    xmlns:xlink="http://www.w3.org/1999/xlink"
-                  >
-                    <defs>
-                      <path
-                        d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                        id="arrow_down-a"
-                      />
-                    </defs>
-                    <use
-                      fill-rule="nonzero"
-                      xlink:href="#arrow_down-a"
-                    />
-                  </svg>
+                  />
                 </span>
               </div>
             </div>
@@ -593,25 +568,27 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
               id="random_id-row"
               title="Detector interval"
             >
-              <label
-                aria-invalid="false"
-                class="euiFormLabel"
-                for="random_id"
-              >
-                <div
-                  style="line-height: 8px;"
+              <div>
+                <label
+                  aria-invalid="false"
+                  class="euiFormLabel"
+                  for="random_id"
                 >
-                  <p>
-                    Detector interval
-                  </p>
-                  <br />
-                  <p
-                    class="sublabel"
+                  <div
+                    style="line-height: 8px;"
                   >
-                    Define how often the detector collects data to generate anomalies. The shorter the interval is, the more real time the detector results will be. The detector interval, together with data ingestion speed, also determines the preparation time of the detector. Long intervals and slow ingestion speed means the detector takes longer time to collect sufficient data to generate anomalies.
-                  </p>
-                </div>
-              </label>
+                    <p>
+                      Detector interval
+                    </p>
+                    <br />
+                    <p
+                      class="sublabel"
+                    >
+                      Define how often the detector collects data to generate anomalies. The shorter the interval is, the more real time the detector results will be. The detector interval, together with data ingestion speed, also determines the preparation time of the detector. Long intervals and slow ingestion speed means the detector takes longer time to collect sufficient data to generate anomalies.
+                    </p>
+                  </div>
+                </label>
+              </div>
               <div
                 class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
                 id="random_id"
@@ -660,25 +637,27 @@ exports[`<CreateDetector /> spec create detector renders the component 1`] = `
           id="random_id-row"
           title="Window delay"
         >
-          <label
-            aria-invalid="false"
-            class="euiFormLabel"
-            for="random_id"
-          >
-            <div
-              style="line-height: 8px;"
+          <div>
+            <label
+              aria-invalid="false"
+              class="euiFormLabel"
+              for="random_id"
             >
-              <p>
-                Window delay
-              </p>
-              <br />
-              <p
-                class="sublabel"
+              <div
+                style="line-height: 8px;"
               >
-                Specify a window of delay for a detector to fetch data, if you need to account for extra processing time.
-              </p>
-            </div>
-          </label>
+                <p>
+                  Window delay
+                </p>
+                <br />
+                <p
+                  class="sublabel"
+                >
+                  Specify a window of delay for a detector to fetch data, if you need to account for extra processing time.
+                </p>
+              </div>
+            </label>
+          </div>
           <div
             class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive"
             id="random_id"