diff --git a/package.json b/package.json
index f6eb2e0399164e..7217530b78f67e 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
   },
   "dependencies": {
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "6.7.4",
+    "@elastic/eui": "6.8.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.2",
diff --git a/x-pack/package.json b/x-pack/package.json
index 48d39046fbf97a..f7fe57f966e8ea 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -120,7 +120,7 @@
   },
   "dependencies": {
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "6.7.4",
+    "@elastic/eui": "6.8.0",
     "@elastic/node-crypto": "0.1.2",
     "@elastic/numeral": "2.3.2",
     "@kbn/babel-preset": "1.0.0",
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
index b2ea097186891d..4274bb6cdac42d 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.js.snap
@@ -591,41 +591,45 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                           }
                           onChange={[Function]}
                         >
-                          <div
-                            className="euiFilePicker"
+                          <EuiI18n
+                            defaults={
+                              Array [
+                                "Clear selected files",
+                                "files selected",
+                              ]
+                            }
+                            tokens={
+                              Array [
+                                "euiFilePicker.clearSelectedFiles",
+                                "euiFilePicker.filesSelected",
+                              ]
+                            }
                           >
                             <div
-                              className="euiFilePicker__wrap"
+                              className="euiFilePicker"
                             >
-                              <input
-                                className="euiFilePicker__input"
-                                id="licenseFile"
-                                onChange={[Function]}
-                                onDragLeave={[Function]}
-                                onDragOver={[Function]}
-                                onDrop={[Function]}
-                                type="file"
-                              />
                               <div
-                                className="euiFilePicker__prompt"
+                                className="euiFilePicker__wrap"
                               >
-                                <EuiIcon
-                                  aria-hidden="true"
-                                  className="euiFilePicker__icon"
-                                  size="l"
-                                  type="importAction"
+                                <input
+                                  className="euiFilePicker__input"
+                                  id="licenseFile"
+                                  onChange={[Function]}
+                                  onDragLeave={[Function]}
+                                  onDragOver={[Function]}
+                                  onDrop={[Function]}
+                                  type="file"
+                                />
+                                <div
+                                  className="euiFilePicker__prompt"
                                 >
-                                  <importAction
+                                  <EuiIcon
                                     aria-hidden="true"
-                                    className="euiIcon euiIcon--large euiFilePicker__icon"
-                                    focusable="false"
-                                    height="16"
-                                    style={null}
-                                    viewBox="0 0 16 16"
-                                    width="16"
-                                    xmlns="http://www.w3.org/2000/svg"
+                                    className="euiFilePicker__icon"
+                                    size="l"
+                                    type="importAction"
                                   >
-                                    <svg
+                                    <importAction
                                       aria-hidden="true"
                                       className="euiIcon euiIcon--large euiFilePicker__icon"
                                       focusable="false"
@@ -635,26 +639,37 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                       width="16"
                                       xmlns="http://www.w3.org/2000/svg"
                                     >
-                                      <path
-                                        d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
-                                      />
-                                    </svg>
-                                  </importAction>
-                                </EuiIcon>
-                                <div
-                                  className="euiFilePicker__promptText"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="Select or drag your license file"
-                                    id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
-                                    values={Object {}}
+                                      <svg
+                                        aria-hidden="true"
+                                        className="euiIcon euiIcon--large euiFilePicker__icon"
+                                        focusable="false"
+                                        height="16"
+                                        style={null}
+                                        viewBox="0 0 16 16"
+                                        width="16"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                      >
+                                        <path
+                                          d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                        />
+                                      </svg>
+                                    </importAction>
+                                  </EuiIcon>
+                                  <div
+                                    className="euiFilePicker__promptText"
                                   >
-                                    Select or drag your license file
-                                  </FormattedMessage>
+                                    <FormattedMessage
+                                      defaultMessage="Select or drag your license file"
+                                      id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
+                                      values={Object {}}
+                                    >
+                                      Select or drag your license file
+                                    </FormattedMessage>
+                                  </div>
                                 </div>
                               </div>
                             </div>
-                          </div>
+                          </EuiI18n>
                         </EuiFilePicker>
                       </div>
                     </EuiText>
@@ -995,43 +1010,48 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                   <div
                     className="euiForm"
                   >
-                    <EuiCallOut
-                      className="euiForm__errors"
-                      color="danger"
-                      size="m"
-                      title="Please address the errors in your form."
+                    <EuiI18n
+                      default="Please address the errors in your form."
+                      token="euiForm.addressFormErrors"
                     >
-                      <div
-                        className="euiCallOut euiCallOut--danger euiForm__errors"
+                      <EuiCallOut
+                        className="euiForm__errors"
+                        color="danger"
+                        size="m"
+                        title="Please address the errors in your form."
                       >
                         <div
-                          className="euiCallOutHeader"
-                        >
-                          <span
-                            className="euiCallOutHeader__title"
-                          >
-                            Please address the errors in your form.
-                          </span>
-                        </div>
-                        <EuiText
-                          grow={true}
-                          size="s"
+                          className="euiCallOut euiCallOut--danger euiForm__errors"
                         >
                           <div
-                            className="euiText euiText--small"
+                            className="euiCallOutHeader"
                           >
-                            <ul>
-                              <li
-                                className="euiForm__error"
-                                key="The supplied license has expired."
-                              >
-                                The supplied license has expired.
-                              </li>
-                            </ul>
+                            <span
+                              className="euiCallOutHeader__title"
+                            >
+                              Please address the errors in your form.
+                            </span>
                           </div>
-                        </EuiText>
-                      </div>
-                    </EuiCallOut>
+                          <EuiText
+                            grow={true}
+                            size="s"
+                          >
+                            <div
+                              className="euiText euiText--small"
+                            >
+                              <ul>
+                                <li
+                                  className="euiForm__error"
+                                  key="The supplied license has expired."
+                                >
+                                  The supplied license has expired.
+                                </li>
+                              </ul>
+                            </div>
+                          </EuiText>
+                        </div>
+                      </EuiCallOut>
+                    </EuiI18n>
                     <EuiText
                       grow={true}
                       size="m"
@@ -1051,41 +1071,45 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                           }
                           onChange={[Function]}
                         >
-                          <div
-                            className="euiFilePicker euiFilePicker-hasFiles"
+                          <EuiI18n
+                            defaults={
+                              Array [
+                                "Clear selected files",
+                                "files selected",
+                              ]
+                            }
+                            tokens={
+                              Array [
+                                "euiFilePicker.clearSelectedFiles",
+                                "euiFilePicker.filesSelected",
+                              ]
+                            }
                           >
                             <div
-                              className="euiFilePicker__wrap"
+                              className="euiFilePicker euiFilePicker-hasFiles"
                             >
-                              <input
-                                className="euiFilePicker__input"
-                                id="licenseFile"
-                                onChange={[Function]}
-                                onDragLeave={[Function]}
-                                onDragOver={[Function]}
-                                onDrop={[Function]}
-                                type="file"
-                              />
                               <div
-                                className="euiFilePicker__prompt"
+                                className="euiFilePicker__wrap"
                               >
-                                <EuiIcon
-                                  aria-hidden="true"
-                                  className="euiFilePicker__icon"
-                                  size="l"
-                                  type="importAction"
+                                <input
+                                  className="euiFilePicker__input"
+                                  id="licenseFile"
+                                  onChange={[Function]}
+                                  onDragLeave={[Function]}
+                                  onDragOver={[Function]}
+                                  onDrop={[Function]}
+                                  type="file"
+                                />
+                                <div
+                                  className="euiFilePicker__prompt"
                                 >
-                                  <importAction
+                                  <EuiIcon
                                     aria-hidden="true"
-                                    className="euiIcon euiIcon--large euiFilePicker__icon"
-                                    focusable="false"
-                                    height="16"
-                                    style={null}
-                                    viewBox="0 0 16 16"
-                                    width="16"
-                                    xmlns="http://www.w3.org/2000/svg"
+                                    className="euiFilePicker__icon"
+                                    size="l"
+                                    type="importAction"
                                   >
-                                    <svg
+                                    <importAction
                                       aria-hidden="true"
                                       className="euiIcon euiIcon--large euiFilePicker__icon"
                                       focusable="false"
@@ -1095,52 +1119,63 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                                       width="16"
                                       xmlns="http://www.w3.org/2000/svg"
                                     >
-                                      <path
-                                        d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
-                                      />
-                                    </svg>
-                                  </importAction>
-                                </EuiIcon>
-                                <div
-                                  className="euiFilePicker__promptText"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="Select or drag your license file"
-                                    id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
-                                    values={Object {}}
+                                      <svg
+                                        aria-hidden="true"
+                                        className="euiIcon euiIcon--large euiFilePicker__icon"
+                                        focusable="false"
+                                        height="16"
+                                        style={null}
+                                        viewBox="0 0 16 16"
+                                        width="16"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                      >
+                                        <path
+                                          d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                        />
+                                      </svg>
+                                    </importAction>
+                                  </EuiIcon>
+                                  <div
+                                    className="euiFilePicker__promptText"
                                   >
-                                    Select or drag your license file
-                                  </FormattedMessage>
-                                </div>
-                                <EuiButtonEmpty
-                                  aria-label="Clear selected files"
-                                  className="euiFilePicker__clearButton"
-                                  color="primary"
-                                  iconSide="left"
-                                  onClick={[Function]}
-                                  size="xs"
-                                  type="button"
-                                >
-                                  <button
+                                    <FormattedMessage
+                                      defaultMessage="Select or drag your license file"
+                                      id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
+                                      values={Object {}}
+                                    >
+                                      Select or drag your license file
+                                    </FormattedMessage>
+                                  </div>
+                                  <EuiButtonEmpty
                                     aria-label="Clear selected files"
-                                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                    className="euiFilePicker__clearButton"
+                                    color="primary"
+                                    iconSide="left"
                                     onClick={[Function]}
+                                    size="xs"
                                     type="button"
                                   >
-                                    <span
-                                      className="euiButtonEmpty__content"
+                                    <button
+                                      aria-label="Clear selected files"
+                                      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                      onClick={[Function]}
+                                      type="button"
                                     >
                                       <span
-                                        className="euiButtonEmpty__text"
+                                        className="euiButtonEmpty__content"
                                       >
-                                        Remove
+                                        <span
+                                          className="euiButtonEmpty__text"
+                                        >
+                                          Remove
+                                        </span>
                                       </span>
-                                    </span>
-                                  </button>
-                                </EuiButtonEmpty>
+                                    </button>
+                                  </EuiButtonEmpty>
+                                </div>
                               </div>
                             </div>
-                          </div>
+                          </EuiI18n>
                         </EuiFilePicker>
                       </div>
                     </EuiText>
@@ -1481,43 +1516,48 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                   <div
                     className="euiForm"
                   >
-                    <EuiCallOut
-                      className="euiForm__errors"
-                      color="danger"
-                      size="m"
-                      title="Please address the errors in your form."
+                    <EuiI18n
+                      default="Please address the errors in your form."
+                      token="euiForm.addressFormErrors"
                     >
-                      <div
-                        className="euiCallOut euiCallOut--danger euiForm__errors"
+                      <EuiCallOut
+                        className="euiForm__errors"
+                        color="danger"
+                        size="m"
+                        title="Please address the errors in your form."
                       >
                         <div
-                          className="euiCallOutHeader"
-                        >
-                          <span
-                            className="euiCallOutHeader__title"
-                          >
-                            Please address the errors in your form.
-                          </span>
-                        </div>
-                        <EuiText
-                          grow={true}
-                          size="s"
+                          className="euiCallOut euiCallOut--danger euiForm__errors"
                         >
                           <div
-                            className="euiText euiText--small"
+                            className="euiCallOutHeader"
                           >
-                            <ul>
-                              <li
-                                className="euiForm__error"
-                                key="The supplied license is not valid for this product."
-                              >
-                                The supplied license is not valid for this product.
-                              </li>
-                            </ul>
+                            <span
+                              className="euiCallOutHeader__title"
+                            >
+                              Please address the errors in your form.
+                            </span>
                           </div>
-                        </EuiText>
-                      </div>
-                    </EuiCallOut>
+                          <EuiText
+                            grow={true}
+                            size="s"
+                          >
+                            <div
+                              className="euiText euiText--small"
+                            >
+                              <ul>
+                                <li
+                                  className="euiForm__error"
+                                  key="The supplied license is not valid for this product."
+                                >
+                                  The supplied license is not valid for this product.
+                                </li>
+                              </ul>
+                            </div>
+                          </EuiText>
+                        </div>
+                      </EuiCallOut>
+                    </EuiI18n>
                     <EuiText
                       grow={true}
                       size="m"
@@ -1537,41 +1577,45 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                           }
                           onChange={[Function]}
                         >
-                          <div
-                            className="euiFilePicker euiFilePicker-hasFiles"
+                          <EuiI18n
+                            defaults={
+                              Array [
+                                "Clear selected files",
+                                "files selected",
+                              ]
+                            }
+                            tokens={
+                              Array [
+                                "euiFilePicker.clearSelectedFiles",
+                                "euiFilePicker.filesSelected",
+                              ]
+                            }
                           >
                             <div
-                              className="euiFilePicker__wrap"
+                              className="euiFilePicker euiFilePicker-hasFiles"
                             >
-                              <input
-                                className="euiFilePicker__input"
-                                id="licenseFile"
-                                onChange={[Function]}
-                                onDragLeave={[Function]}
-                                onDragOver={[Function]}
-                                onDrop={[Function]}
-                                type="file"
-                              />
                               <div
-                                className="euiFilePicker__prompt"
+                                className="euiFilePicker__wrap"
                               >
-                                <EuiIcon
-                                  aria-hidden="true"
-                                  className="euiFilePicker__icon"
-                                  size="l"
-                                  type="importAction"
+                                <input
+                                  className="euiFilePicker__input"
+                                  id="licenseFile"
+                                  onChange={[Function]}
+                                  onDragLeave={[Function]}
+                                  onDragOver={[Function]}
+                                  onDrop={[Function]}
+                                  type="file"
+                                />
+                                <div
+                                  className="euiFilePicker__prompt"
                                 >
-                                  <importAction
+                                  <EuiIcon
                                     aria-hidden="true"
-                                    className="euiIcon euiIcon--large euiFilePicker__icon"
-                                    focusable="false"
-                                    height="16"
-                                    style={null}
-                                    viewBox="0 0 16 16"
-                                    width="16"
-                                    xmlns="http://www.w3.org/2000/svg"
+                                    className="euiFilePicker__icon"
+                                    size="l"
+                                    type="importAction"
                                   >
-                                    <svg
+                                    <importAction
                                       aria-hidden="true"
                                       className="euiIcon euiIcon--large euiFilePicker__icon"
                                       focusable="false"
@@ -1581,52 +1625,63 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                                       width="16"
                                       xmlns="http://www.w3.org/2000/svg"
                                     >
-                                      <path
-                                        d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
-                                      />
-                                    </svg>
-                                  </importAction>
-                                </EuiIcon>
-                                <div
-                                  className="euiFilePicker__promptText"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="Select or drag your license file"
-                                    id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
-                                    values={Object {}}
+                                      <svg
+                                        aria-hidden="true"
+                                        className="euiIcon euiIcon--large euiFilePicker__icon"
+                                        focusable="false"
+                                        height="16"
+                                        style={null}
+                                        viewBox="0 0 16 16"
+                                        width="16"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                      >
+                                        <path
+                                          d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                        />
+                                      </svg>
+                                    </importAction>
+                                  </EuiIcon>
+                                  <div
+                                    className="euiFilePicker__promptText"
                                   >
-                                    Select or drag your license file
-                                  </FormattedMessage>
-                                </div>
-                                <EuiButtonEmpty
-                                  aria-label="Clear selected files"
-                                  className="euiFilePicker__clearButton"
-                                  color="primary"
-                                  iconSide="left"
-                                  onClick={[Function]}
-                                  size="xs"
-                                  type="button"
-                                >
-                                  <button
+                                    <FormattedMessage
+                                      defaultMessage="Select or drag your license file"
+                                      id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
+                                      values={Object {}}
+                                    >
+                                      Select or drag your license file
+                                    </FormattedMessage>
+                                  </div>
+                                  <EuiButtonEmpty
                                     aria-label="Clear selected files"
-                                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                    className="euiFilePicker__clearButton"
+                                    color="primary"
+                                    iconSide="left"
                                     onClick={[Function]}
+                                    size="xs"
                                     type="button"
                                   >
-                                    <span
-                                      className="euiButtonEmpty__content"
+                                    <button
+                                      aria-label="Clear selected files"
+                                      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                      onClick={[Function]}
+                                      type="button"
                                     >
                                       <span
-                                        className="euiButtonEmpty__text"
+                                        className="euiButtonEmpty__content"
                                       >
-                                        Remove
+                                        <span
+                                          className="euiButtonEmpty__text"
+                                        >
+                                          Remove
+                                        </span>
                                       </span>
-                                    </span>
-                                  </button>
-                                </EuiButtonEmpty>
+                                    </button>
+                                  </EuiButtonEmpty>
+                                </div>
                               </div>
                             </div>
-                          </div>
+                          </EuiI18n>
                         </EuiFilePicker>
                       </div>
                     </EuiText>
@@ -1967,43 +2022,48 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                   <div
                     className="euiForm"
                   >
-                    <EuiCallOut
-                      className="euiForm__errors"
-                      color="danger"
-                      size="m"
-                      title="Please address the errors in your form."
+                    <EuiI18n
+                      default="Please address the errors in your form."
+                      token="euiForm.addressFormErrors"
                     >
-                      <div
-                        className="euiCallOut euiCallOut--danger euiForm__errors"
+                      <EuiCallOut
+                        className="euiForm__errors"
+                        color="danger"
+                        size="m"
+                        title="Please address the errors in your form."
                       >
                         <div
-                          className="euiCallOutHeader"
-                        >
-                          <span
-                            className="euiCallOutHeader__title"
-                          >
-                            Please address the errors in your form.
-                          </span>
-                        </div>
-                        <EuiText
-                          grow={true}
-                          size="s"
+                          className="euiCallOut euiCallOut--danger euiForm__errors"
                         >
                           <div
-                            className="euiText euiText--small"
+                            className="euiCallOutHeader"
                           >
-                            <ul>
-                              <li
-                                className="euiForm__error"
-                                key="Error encountered uploading license: Check your license file."
-                              >
-                                Error encountered uploading license: Check your license file.
-                              </li>
-                            </ul>
+                            <span
+                              className="euiCallOutHeader__title"
+                            >
+                              Please address the errors in your form.
+                            </span>
                           </div>
-                        </EuiText>
-                      </div>
-                    </EuiCallOut>
+                          <EuiText
+                            grow={true}
+                            size="s"
+                          >
+                            <div
+                              className="euiText euiText--small"
+                            >
+                              <ul>
+                                <li
+                                  className="euiForm__error"
+                                  key="Error encountered uploading license: Check your license file."
+                                >
+                                  Error encountered uploading license: Check your license file.
+                                </li>
+                              </ul>
+                            </div>
+                          </EuiText>
+                        </div>
+                      </EuiCallOut>
+                    </EuiI18n>
                     <EuiText
                       grow={true}
                       size="m"
@@ -2023,41 +2083,45 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                           }
                           onChange={[Function]}
                         >
-                          <div
-                            className="euiFilePicker euiFilePicker-hasFiles"
+                          <EuiI18n
+                            defaults={
+                              Array [
+                                "Clear selected files",
+                                "files selected",
+                              ]
+                            }
+                            tokens={
+                              Array [
+                                "euiFilePicker.clearSelectedFiles",
+                                "euiFilePicker.filesSelected",
+                              ]
+                            }
                           >
                             <div
-                              className="euiFilePicker__wrap"
+                              className="euiFilePicker euiFilePicker-hasFiles"
                             >
-                              <input
-                                className="euiFilePicker__input"
-                                id="licenseFile"
-                                onChange={[Function]}
-                                onDragLeave={[Function]}
-                                onDragOver={[Function]}
-                                onDrop={[Function]}
-                                type="file"
-                              />
                               <div
-                                className="euiFilePicker__prompt"
+                                className="euiFilePicker__wrap"
                               >
-                                <EuiIcon
-                                  aria-hidden="true"
-                                  className="euiFilePicker__icon"
-                                  size="l"
-                                  type="importAction"
+                                <input
+                                  className="euiFilePicker__input"
+                                  id="licenseFile"
+                                  onChange={[Function]}
+                                  onDragLeave={[Function]}
+                                  onDragOver={[Function]}
+                                  onDrop={[Function]}
+                                  type="file"
+                                />
+                                <div
+                                  className="euiFilePicker__prompt"
                                 >
-                                  <importAction
+                                  <EuiIcon
                                     aria-hidden="true"
-                                    className="euiIcon euiIcon--large euiFilePicker__icon"
-                                    focusable="false"
-                                    height="16"
-                                    style={null}
-                                    viewBox="0 0 16 16"
-                                    width="16"
-                                    xmlns="http://www.w3.org/2000/svg"
+                                    className="euiFilePicker__icon"
+                                    size="l"
+                                    type="importAction"
                                   >
-                                    <svg
+                                    <importAction
                                       aria-hidden="true"
                                       className="euiIcon euiIcon--large euiFilePicker__icon"
                                       focusable="false"
@@ -2067,52 +2131,63 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                                       width="16"
                                       xmlns="http://www.w3.org/2000/svg"
                                     >
-                                      <path
-                                        d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
-                                      />
-                                    </svg>
-                                  </importAction>
-                                </EuiIcon>
-                                <div
-                                  className="euiFilePicker__promptText"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="Select or drag your license file"
-                                    id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
-                                    values={Object {}}
+                                      <svg
+                                        aria-hidden="true"
+                                        className="euiIcon euiIcon--large euiFilePicker__icon"
+                                        focusable="false"
+                                        height="16"
+                                        style={null}
+                                        viewBox="0 0 16 16"
+                                        width="16"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                      >
+                                        <path
+                                          d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                        />
+                                      </svg>
+                                    </importAction>
+                                  </EuiIcon>
+                                  <div
+                                    className="euiFilePicker__promptText"
                                   >
-                                    Select or drag your license file
-                                  </FormattedMessage>
-                                </div>
-                                <EuiButtonEmpty
-                                  aria-label="Clear selected files"
-                                  className="euiFilePicker__clearButton"
-                                  color="primary"
-                                  iconSide="left"
-                                  onClick={[Function]}
-                                  size="xs"
-                                  type="button"
-                                >
-                                  <button
+                                    <FormattedMessage
+                                      defaultMessage="Select or drag your license file"
+                                      id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
+                                      values={Object {}}
+                                    >
+                                      Select or drag your license file
+                                    </FormattedMessage>
+                                  </div>
+                                  <EuiButtonEmpty
                                     aria-label="Clear selected files"
-                                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                    className="euiFilePicker__clearButton"
+                                    color="primary"
+                                    iconSide="left"
                                     onClick={[Function]}
+                                    size="xs"
                                     type="button"
                                   >
-                                    <span
-                                      className="euiButtonEmpty__content"
+                                    <button
+                                      aria-label="Clear selected files"
+                                      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                      onClick={[Function]}
+                                      type="button"
                                     >
                                       <span
-                                        className="euiButtonEmpty__text"
+                                        className="euiButtonEmpty__content"
                                       >
-                                        Remove
+                                        <span
+                                          className="euiButtonEmpty__text"
+                                        >
+                                          Remove
+                                        </span>
                                       </span>
-                                    </span>
-                                  </button>
-                                </EuiButtonEmpty>
+                                    </button>
+                                  </EuiButtonEmpty>
+                                </div>
                               </div>
                             </div>
-                          </div>
+                          </EuiI18n>
                         </EuiFilePicker>
                       </div>
                     </EuiText>
@@ -2453,43 +2528,48 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                   <div
                     className="euiForm"
                   >
-                    <EuiCallOut
-                      className="euiForm__errors"
-                      color="danger"
-                      size="m"
-                      title="Please address the errors in your form."
+                    <EuiI18n
+                      default="Please address the errors in your form."
+                      token="euiForm.addressFormErrors"
                     >
-                      <div
-                        className="euiCallOut euiCallOut--danger euiForm__errors"
+                      <EuiCallOut
+                        className="euiForm__errors"
+                        color="danger"
+                        size="m"
+                        title="Please address the errors in your form."
                       >
                         <div
-                          className="euiCallOutHeader"
-                        >
-                          <span
-                            className="euiCallOutHeader__title"
-                          >
-                            Please address the errors in your form.
-                          </span>
-                        </div>
-                        <EuiText
-                          grow={true}
-                          size="s"
+                          className="euiCallOut euiCallOut--danger euiForm__errors"
                         >
                           <div
-                            className="euiText euiText--small"
+                            className="euiCallOutHeader"
                           >
-                            <ul>
-                              <li
-                                className="euiForm__error"
-                                key="Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled"
-                              >
-                                Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled
-                              </li>
-                            </ul>
+                            <span
+                              className="euiCallOutHeader__title"
+                            >
+                              Please address the errors in your form.
+                            </span>
                           </div>
-                        </EuiText>
-                      </div>
-                    </EuiCallOut>
+                          <EuiText
+                            grow={true}
+                            size="s"
+                          >
+                            <div
+                              className="euiText euiText--small"
+                            >
+                              <ul>
+                                <li
+                                  className="euiForm__error"
+                                  key="Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled"
+                                >
+                                  Error encountered uploading license: Can not upgrade to a production license unless TLS is configured or security is disabled
+                                </li>
+                              </ul>
+                            </div>
+                          </EuiText>
+                        </div>
+                      </EuiCallOut>
+                    </EuiI18n>
                     <EuiText
                       grow={true}
                       size="m"
@@ -2509,41 +2589,45 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                           }
                           onChange={[Function]}
                         >
-                          <div
-                            className="euiFilePicker euiFilePicker-hasFiles"
+                          <EuiI18n
+                            defaults={
+                              Array [
+                                "Clear selected files",
+                                "files selected",
+                              ]
+                            }
+                            tokens={
+                              Array [
+                                "euiFilePicker.clearSelectedFiles",
+                                "euiFilePicker.filesSelected",
+                              ]
+                            }
                           >
                             <div
-                              className="euiFilePicker__wrap"
+                              className="euiFilePicker euiFilePicker-hasFiles"
                             >
-                              <input
-                                className="euiFilePicker__input"
-                                id="licenseFile"
-                                onChange={[Function]}
-                                onDragLeave={[Function]}
-                                onDragOver={[Function]}
-                                onDrop={[Function]}
-                                type="file"
-                              />
                               <div
-                                className="euiFilePicker__prompt"
+                                className="euiFilePicker__wrap"
                               >
-                                <EuiIcon
-                                  aria-hidden="true"
-                                  className="euiFilePicker__icon"
-                                  size="l"
-                                  type="importAction"
+                                <input
+                                  className="euiFilePicker__input"
+                                  id="licenseFile"
+                                  onChange={[Function]}
+                                  onDragLeave={[Function]}
+                                  onDragOver={[Function]}
+                                  onDrop={[Function]}
+                                  type="file"
+                                />
+                                <div
+                                  className="euiFilePicker__prompt"
                                 >
-                                  <importAction
+                                  <EuiIcon
                                     aria-hidden="true"
-                                    className="euiIcon euiIcon--large euiFilePicker__icon"
-                                    focusable="false"
-                                    height="16"
-                                    style={null}
-                                    viewBox="0 0 16 16"
-                                    width="16"
-                                    xmlns="http://www.w3.org/2000/svg"
+                                    className="euiFilePicker__icon"
+                                    size="l"
+                                    type="importAction"
                                   >
-                                    <svg
+                                    <importAction
                                       aria-hidden="true"
                                       className="euiIcon euiIcon--large euiFilePicker__icon"
                                       focusable="false"
@@ -2553,52 +2637,63 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                                       width="16"
                                       xmlns="http://www.w3.org/2000/svg"
                                     >
-                                      <path
-                                        d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
-                                      />
-                                    </svg>
-                                  </importAction>
-                                </EuiIcon>
-                                <div
-                                  className="euiFilePicker__promptText"
-                                >
-                                  <FormattedMessage
-                                    defaultMessage="Select or drag your license file"
-                                    id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
-                                    values={Object {}}
+                                      <svg
+                                        aria-hidden="true"
+                                        className="euiIcon euiIcon--large euiFilePicker__icon"
+                                        focusable="false"
+                                        height="16"
+                                        style={null}
+                                        viewBox="0 0 16 16"
+                                        width="16"
+                                        xmlns="http://www.w3.org/2000/svg"
+                                      >
+                                        <path
+                                          d="M9 10.114l1.85-1.943a.52.52 0 0 1 .77 0c.214.228.214.6 0 .829l-1.95 2.05a1.552 1.552 0 0 1-2.31 0L5.41 9a.617.617 0 0 1 0-.829.52.52 0 0 1 .77 0L8 10.082V1.556C8 1.249 8.224 1 8.5 1s.5.249.5.556v8.558zM4.18 6a.993.993 0 0 0-.972.804l-1.189 6A.995.995 0 0 0 2.991 14h11.018a1 1 0 0 0 .972-1.196l-1.19-6a.993.993 0 0 0-.97-.804H4.18zM6 5v1h5V5h1.825c.946 0 1.76.673 1.946 1.608l1.19 6A2 2 0 0 1 14.016 15H2.984a1.992 1.992 0 0 1-1.945-2.392l1.19-6C2.414 5.673 3.229 5 4.174 5H6z"
+                                        />
+                                      </svg>
+                                    </importAction>
+                                  </EuiIcon>
+                                  <div
+                                    className="euiFilePicker__promptText"
                                   >
-                                    Select or drag your license file
-                                  </FormattedMessage>
-                                </div>
-                                <EuiButtonEmpty
-                                  aria-label="Clear selected files"
-                                  className="euiFilePicker__clearButton"
-                                  color="primary"
-                                  iconSide="left"
-                                  onClick={[Function]}
-                                  size="xs"
-                                  type="button"
-                                >
-                                  <button
+                                    <FormattedMessage
+                                      defaultMessage="Select or drag your license file"
+                                      id="xpack.licenseMgmt.uploadLicense.selectLicenseFileDescription"
+                                      values={Object {}}
+                                    >
+                                      Select or drag your license file
+                                    </FormattedMessage>
+                                  </div>
+                                  <EuiButtonEmpty
                                     aria-label="Clear selected files"
-                                    className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                    className="euiFilePicker__clearButton"
+                                    color="primary"
+                                    iconSide="left"
                                     onClick={[Function]}
+                                    size="xs"
                                     type="button"
                                   >
-                                    <span
-                                      className="euiButtonEmpty__content"
+                                    <button
+                                      aria-label="Clear selected files"
+                                      className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiFilePicker__clearButton"
+                                      onClick={[Function]}
+                                      type="button"
                                     >
                                       <span
-                                        className="euiButtonEmpty__text"
+                                        className="euiButtonEmpty__content"
                                       >
-                                        Remove
+                                        <span
+                                          className="euiButtonEmpty__text"
+                                        >
+                                          Remove
+                                        </span>
                                       </span>
-                                    </span>
-                                  </button>
-                                </EuiButtonEmpty>
+                                    </button>
+                                  </EuiButtonEmpty>
+                                </div>
                               </div>
                             </div>
-                          </div>
+                          </EuiI18n>
                         </EuiFilePicker>
                       </div>
                     </EuiText>
diff --git a/x-pack/test/functional/apps/maps/saved_object_management.js b/x-pack/test/functional/apps/maps/saved_object_management.js
index 83e27645e1bc3f..96c99490d43b2f 100644
--- a/x-pack/test/functional/apps/maps/saved_object_management.js
+++ b/x-pack/test/functional/apps/maps/saved_object_management.js
@@ -32,8 +32,8 @@ export default function ({ getPageObjects, getService }) {
 
       it('should update global Kibana refresh config to value stored with map', async () => {
         const kibanaRefreshConfig = await PageObjects.timePicker.getRefreshConfig();
-        expect(kibanaRefreshConfig.interval).to.equal('0.02');
-        expect(kibanaRefreshConfig.units).to.equal('minutes');
+        expect(kibanaRefreshConfig.interval).to.equal('1');
+        expect(kibanaRefreshConfig.units).to.equal('seconds');
         expect(kibanaRefreshConfig.isPaused).to.equal(true);
       });
 
diff --git a/yarn.lock b/yarn.lock
index cee92b77e572ca..29ab338ca6c27e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -871,10 +871,10 @@
     tabbable "^1.1.0"
     uuid "^3.1.0"
 
-"@elastic/eui@6.7.4":
-  version "6.7.4"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-6.7.4.tgz#04fb02cfee7d7851ca90659eae121555f56ff83a"
-  integrity sha512-h0542LAqKjFdbyV8heiwQOlGe6fkThNagPCr7wymFBF/HYBWvIcJSplSVVRNgwgNRvWEXEGLOGrVLInn0Atfpg==
+"@elastic/eui@6.8.0":
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-6.8.0.tgz#16152cb2b04ddc756bed5cadb525d27a8904ec42"
+  integrity sha512-AnBgIpcEzpKrdbqYRIitU0kPN0fTgO2olOSaQqoKz8LUQButYLE9+ghV6c48K12UuuMQUK7m+qvyXt2z/5xCGQ==
   dependencies:
     "@types/lodash" "^4.14.116"
     "@types/numeral" "^0.0.25"
@@ -890,6 +890,7 @@
     react-ace "^5.5.0"
     react-color "^2.13.8"
     react-input-autosize "^2.2.1"
+    react-is "~16.3.0"
     react-virtualized "^9.18.5"
     react-vis "1.10.2"
     resize-observer-polyfill "^1.5.0"
@@ -17702,6 +17703,11 @@ react-is@^16.4.0, react-is@^16.5.2:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.6.0.tgz#456645144581a6e99f6816ae2bd24ee94bdd0c01"
   integrity sha512-q8U7k0Fi7oxF1HvQgyBjPwDXeMplEsArnKt2iYhuIF86+GBbgLHdAmokL3XUFjTd7Q363OSNG55FOGUdONVn1g==
 
+react-is@~16.3.0:
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22"
+  integrity sha512-ybEM7YOr4yBgFd6w8dJqwxegqZGJNBZl6U27HnGKuTZmDvVrD5quWOK/wAnMywiZzW+Qsk+l4X2c70+thp/A8Q==
+
 react-lib-adler32@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/react-lib-adler32/-/react-lib-adler32-1.0.1.tgz#01f7a0e24fe715580aadb8a827c39a850e1ccc4e"