diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index 8a845149b95e806..eb9f2e7265f4740 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -37,33 +37,29 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
         class="euiForm"
       >
         <div
-          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+          class="euiFilePicker emotion-euiFilePicker-fullWidth"
         >
+          <input
+            aria-describedby="licenseFile-filePicker__prompt"
+            class="euiFilePicker__input emotion-euiFilePicker__input-largeInteractive"
+            id="licenseFile"
+            type="file"
+          />
           <div
-            class="euiFilePicker__wrap"
+            class="euiFilePicker__prompt emotion-euiFilePicker__prompt-large"
+            id="licenseFile-filePicker__prompt"
           >
-            <input
-              aria-describedby="licenseFile-filePicker__prompt"
-              class="euiFilePicker__input"
-              id="licenseFile"
-              type="file"
+            <span
+              aria-hidden="true"
+              class="euiFilePicker__icon emotion-euiFilePicker__icon-large"
+              color="primary"
+              data-euiicon-type="importAction"
             />
-            <div
-              class="euiFilePicker__prompt"
-              id="licenseFile-filePicker__prompt"
+            <span
+              class="euiFilePicker__promptText"
             >
-              <span
-                aria-hidden="true"
-                class="euiFilePicker__icon"
-                color="primary"
-                data-euiicon-type="importAction"
-              />
-              <div
-                class="euiFilePicker__promptText"
-              >
-                Select or drag your license file
-              </div>
-            </div>
+              Select or drag your license file
+            </span>
           </div>
         </div>
         <div
@@ -180,33 +176,29 @@ exports[`UploadLicense should display an error when ES says license is expired 1
           </div>
         </div>
         <div
-          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+          class="euiFilePicker emotion-euiFilePicker-fullWidth"
         >
+          <input
+            aria-describedby="licenseFile-filePicker__prompt"
+            class="euiFilePicker__input emotion-euiFilePicker__input-largeInteractive"
+            id="licenseFile"
+            type="file"
+          />
           <div
-            class="euiFilePicker__wrap"
+            class="euiFilePicker__prompt emotion-euiFilePicker__prompt-large"
+            id="licenseFile-filePicker__prompt"
           >
-            <input
-              aria-describedby="licenseFile-filePicker__prompt"
-              class="euiFilePicker__input"
-              id="licenseFile"
-              type="file"
+            <span
+              aria-hidden="true"
+              class="euiFilePicker__icon emotion-euiFilePicker__icon-large"
+              color="primary"
+              data-euiicon-type="importAction"
             />
-            <div
-              class="euiFilePicker__prompt"
-              id="licenseFile-filePicker__prompt"
+            <span
+              class="euiFilePicker__promptText"
             >
-              <span
-                aria-hidden="true"
-                class="euiFilePicker__icon"
-                color="primary"
-                data-euiicon-type="importAction"
-              />
-              <div
-                class="euiFilePicker__promptText"
-              >
-                Select or drag your license file
-              </div>
-            </div>
+              Select or drag your license file
+            </span>
           </div>
         </div>
         <div
@@ -323,33 +315,29 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
           </div>
         </div>
         <div
-          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+          class="euiFilePicker emotion-euiFilePicker-fullWidth"
         >
+          <input
+            aria-describedby="licenseFile-filePicker__prompt"
+            class="euiFilePicker__input emotion-euiFilePicker__input-largeInteractive"
+            id="licenseFile"
+            type="file"
+          />
           <div
-            class="euiFilePicker__wrap"
+            class="euiFilePicker__prompt emotion-euiFilePicker__prompt-large"
+            id="licenseFile-filePicker__prompt"
           >
-            <input
-              aria-describedby="licenseFile-filePicker__prompt"
-              class="euiFilePicker__input"
-              id="licenseFile"
-              type="file"
+            <span
+              aria-hidden="true"
+              class="euiFilePicker__icon emotion-euiFilePicker__icon-large"
+              color="primary"
+              data-euiicon-type="importAction"
             />
-            <div
-              class="euiFilePicker__prompt"
-              id="licenseFile-filePicker__prompt"
+            <span
+              class="euiFilePicker__promptText"
             >
-              <span
-                aria-hidden="true"
-                class="euiFilePicker__icon"
-                color="primary"
-                data-euiicon-type="importAction"
-              />
-              <div
-                class="euiFilePicker__promptText"
-              >
-                Select or drag your license file
-              </div>
-            </div>
+              Select or drag your license file
+            </span>
           </div>
         </div>
         <div
@@ -466,33 +454,29 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
           </div>
         </div>
         <div
-          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+          class="euiFilePicker emotion-euiFilePicker-fullWidth"
         >
+          <input
+            aria-describedby="licenseFile-filePicker__prompt"
+            class="euiFilePicker__input emotion-euiFilePicker__input-largeInteractive"
+            id="licenseFile"
+            type="file"
+          />
           <div
-            class="euiFilePicker__wrap"
+            class="euiFilePicker__prompt emotion-euiFilePicker__prompt-large"
+            id="licenseFile-filePicker__prompt"
           >
-            <input
-              aria-describedby="licenseFile-filePicker__prompt"
-              class="euiFilePicker__input"
-              id="licenseFile"
-              type="file"
+            <span
+              aria-hidden="true"
+              class="euiFilePicker__icon emotion-euiFilePicker__icon-large"
+              color="primary"
+              data-euiicon-type="importAction"
             />
-            <div
-              class="euiFilePicker__prompt"
-              id="licenseFile-filePicker__prompt"
+            <span
+              class="euiFilePicker__promptText"
             >
-              <span
-                aria-hidden="true"
-                class="euiFilePicker__icon"
-                color="primary"
-                data-euiicon-type="importAction"
-              />
-              <div
-                class="euiFilePicker__promptText"
-              >
-                Select or drag your license file
-              </div>
-            </div>
+              Select or drag your license file
+            </span>
           </div>
         </div>
         <div
@@ -609,33 +593,29 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
           </div>
         </div>
         <div
-          class="euiFilePicker euiFilePicker--large euiFilePicker--fullWidth"
+          class="euiFilePicker emotion-euiFilePicker-fullWidth"
         >
+          <input
+            aria-describedby="licenseFile-filePicker__prompt"
+            class="euiFilePicker__input emotion-euiFilePicker__input-largeInteractive"
+            id="licenseFile"
+            type="file"
+          />
           <div
-            class="euiFilePicker__wrap"
+            class="euiFilePicker__prompt emotion-euiFilePicker__prompt-large"
+            id="licenseFile-filePicker__prompt"
           >
-            <input
-              aria-describedby="licenseFile-filePicker__prompt"
-              class="euiFilePicker__input"
-              id="licenseFile"
-              type="file"
+            <span
+              aria-hidden="true"
+              class="euiFilePicker__icon emotion-euiFilePicker__icon-large"
+              color="primary"
+              data-euiicon-type="importAction"
             />
-            <div
-              class="euiFilePicker__prompt"
-              id="licenseFile-filePicker__prompt"
+            <span
+              class="euiFilePicker__promptText"
             >
-              <span
-                aria-hidden="true"
-                class="euiFilePicker__icon"
-                color="primary"
-                data-euiicon-type="importAction"
-              />
-              <div
-                class="euiFilePicker__promptText"
-              >
-                Select or drag your license file
-              </div>
-            </div>
+              Select or drag your license file
+            </span>
           </div>
         </div>
         <div
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
index 7f380b8d15c729b..16293d2db5057d4 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
@@ -35,11 +35,9 @@ exports[`should render a custom icon modal with an existing icon 1`] = `
           isInvalid={false}
           labelType="label"
         >
-          <EuiFilePicker
+          <EuiFilePickerClass
             accept=".svg"
             className="mapsImageUpload"
-            compressed={false}
-            display="large"
             initialPromptText="Select or drag and drop an SVG icon"
             isInvalid={false}
             onChange={[Function]}
@@ -254,11 +252,9 @@ exports[`should render an empty custom icon modal 1`] = `
           isInvalid={false}
           labelType="label"
         >
-          <EuiFilePicker
+          <EuiFilePickerClass
             accept=".svg"
             className="mapsImageUpload"
-            compressed={false}
-            display="large"
             initialPromptText="Select or drag and drop an SVG icon"
             isInvalid={false}
             onChange={[Function]}
diff --git a/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap b/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
index 6b56afba3ebe297..747e801a278a70b 100644
--- a/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
+++ b/x-pack/plugins/ml/public/application/settings/calendars/edit/import_modal/__snapshots__/import_modal.test.js.snap
@@ -40,10 +40,9 @@ exports[`ImportModal Renders import modal 1`] = `
         <EuiFlexItem
           grow={false}
         >
-          <EuiFilePicker
+          <EuiFilePickerClass
             compressed={true}
             disabled={false}
-            display="large"
             initialPromptText="Select or drag and drop a file"
             onChange={[Function]}
           />