diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
index 5a8cd06b8ecc..5c7955eb3ada 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
@@ -60,7 +60,7 @@ exports[`Intro component renders correctly 1`] = `
             <div
               className="euiTextColor euiTextColor--default"
             >
-              <div>
+              <p>
                 <FormattedMessage
                   defaultMessage="Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be."
                   id="savedObjectsManagement.view.howToModifyObjectDescription"
@@ -68,7 +68,7 @@ exports[`Intro component renders correctly 1`] = `
                 >
                   Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn’t be.
                 </FormattedMessage>
-              </div>
+              </p>
             </div>
           </EuiTextColor>
         </div>
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
index f977c17df41d..7ec56732ec7c 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
@@ -62,7 +62,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
             <div
               className="euiTextColor euiTextColor--default"
             >
-              <div>
+              <p>
                 <FormattedMessage
                   defaultMessage="The index pattern associated with this object no longer exists."
                   id="savedObjectsManagement.view.indexPatternDoesNotExistErrorMessage"
@@ -70,8 +70,8 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
                 >
                   The index pattern associated with this object no longer exists.
                 </FormattedMessage>
-              </div>
-              <div>
+              </p>
+              <p>
                 <FormattedMessage
                   defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
                   id="savedObjectsManagement.view.howToFixErrorDescription"
@@ -79,7 +79,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
                 >
                   If you know what this error means, go ahead and fix it — otherwise click the delete button above.
                 </FormattedMessage>
-              </div>
+              </p>
             </div>
           </EuiTextColor>
         </div>
@@ -151,7 +151,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
             <div
               className="euiTextColor euiTextColor--default"
             >
-              <div>
+              <p>
                 <FormattedMessage
                   defaultMessage="A field associated with this object no longer exists in the index pattern."
                   id="savedObjectsManagement.view.fieldDoesNotExistErrorMessage"
@@ -159,8 +159,8 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
                 >
                   A field associated with this object no longer exists in the index pattern.
                 </FormattedMessage>
-              </div>
-              <div>
+              </p>
+              <p>
                 <FormattedMessage
                   defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
                   id="savedObjectsManagement.view.howToFixErrorDescription"
@@ -168,7 +168,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
                 >
                   If you know what this error means, go ahead and fix it — otherwise click the delete button above.
                 </FormattedMessage>
-              </div>
+              </p>
             </div>
           </EuiTextColor>
         </div>
@@ -240,7 +240,7 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
             <div
               className="euiTextColor euiTextColor--default"
             >
-              <div>
+              <p>
                 <FormattedMessage
                   defaultMessage="The saved search associated with this object no longer exists."
                   id="savedObjectsManagement.view.savedSearchDoesNotExistErrorMessage"
@@ -248,8 +248,8 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
                 >
                   The saved search associated with this object no longer exists.
                 </FormattedMessage>
-              </div>
-              <div>
+              </p>
+              <p>
                 <FormattedMessage
                   defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
                   id="savedObjectsManagement.view.howToFixErrorDescription"
@@ -257,7 +257,7 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
                 >
                   If you know what this error means, go ahead and fix it — otherwise click the delete button above.
                 </FormattedMessage>
-              </div>
+              </p>
             </div>
           </EuiTextColor>
         </div>
@@ -329,8 +329,8 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
             <div
               className="euiTextColor euiTextColor--default"
             >
-              <div />
-              <div>
+              <p />
+              <p>
                 <FormattedMessage
                   defaultMessage="If you know what this error means, go ahead and fix it — otherwise click the delete button above."
                   id="savedObjectsManagement.view.howToFixErrorDescription"
@@ -338,7 +338,7 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
                 >
                   If you know what this error means, go ahead and fix it — otherwise click the delete button above.
                 </FormattedMessage>
-              </div>
+              </p>
             </div>
           </EuiTextColor>
         </div>
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx
index ef16a7330410..788f2e24116f 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/intro.tsx
@@ -44,12 +44,12 @@ export const Intro = () => {
       iconType="alert"
       color="warning"
     >
-      <div>
+      <p>
         <FormattedMessage
           id="savedObjectsManagement.view.howToModifyObjectDescription"
           defaultMessage="Modifying objects is for advanced users only. Object properties are not validated and invalid objects could cause errors, data loss, or worse. Unless someone with intimate knowledge of the code told you to be in here, you probably shouldn&rsquo;t be."
         />
-      </div>
+      </p>
     </EuiCallOut>
   );
 };
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
index 91f60f170717..59fb0a984606 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/not_found_errors.tsx
@@ -76,13 +76,13 @@ export const NotFoundErrors = ({ type }: NotFoundErrors) => {
       iconType="alert"
       color="danger"
     >
-      <div>{getMessage()}</div>
-      <div>
+      <p>{getMessage()}</p>
+      <p>
         <FormattedMessage
           id="savedObjectsManagement.view.howToFixErrorDescription"
           defaultMessage="If you know what this error means, go ahead and fix it &mdash; otherwise click the delete button above."
         />
-      </div>
+      </p>
     </EuiCallOut>
   );
 };
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
index f9091d06c691..c91fcbd7769e 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
@@ -21,43 +21,41 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
     </EuiTitle>
   </EuiFlyoutHeader>
   <EuiFlyoutBody>
-    <span>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCallOut
-        color="warning"
-        data-test-subj="importSavedObjectsConflictsWarning"
-        iconType="help"
-        title={
-          <FormattedMessage
-            defaultMessage="Index Pattern Conflicts"
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
-            values={Object {}}
-          />
-        }
-      >
-        <p>
-          <FormattedMessage
-            defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
-            values={
-              Object {
-                "indexPatternLink": <EuiLink
-                  href=""
-                >
-                  <FormattedMessage
-                    defaultMessage="create a new index pattern"
-                    id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
-                    values={Object {}}
-                  />
-                </EuiLink>,
-              }
+    <EuiSpacer
+      size="s"
+    />
+    <EuiCallOut
+      color="warning"
+      data-test-subj="importSavedObjectsConflictsWarning"
+      iconType="help"
+      title={
+        <FormattedMessage
+          defaultMessage="Index Pattern Conflicts"
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
+          values={Object {}}
+        />
+      }
+    >
+      <p>
+        <FormattedMessage
+          defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
+          values={
+            Object {
+              "indexPatternLink": <EuiLink
+                href=""
+              >
+                <FormattedMessage
+                  defaultMessage="create a new index pattern"
+                  id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                  values={Object {}}
+                />
+              </EuiLink>,
             }
-          />
-        </p>
-      </EuiCallOut>
-    </span>
+          }
+        />
+      </p>
+    </EuiCallOut>
     <EuiInMemoryTable
       columns={
         Array [
@@ -284,71 +282,67 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
     </EuiTitle>
   </EuiFlyoutHeader>
   <EuiFlyoutBody>
-    <span>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCallOut
-        color="warning"
-        data-test-subj="importSavedObjectsLegacyWarning"
-        iconType="help"
-        title={
-          <FormattedMessage
-            defaultMessage="Support for JSON files is going away"
-            id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
-            values={Object {}}
-          />
-        }
-      >
-        <p>
-          <FormattedMessage
-            defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
-            id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
-            values={Object {}}
-          />
-        </p>
-      </EuiCallOut>
-      <EuiSpacer
-        size="m"
-      />
-    </span>
-    <span>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCallOut
-        color="warning"
-        data-test-subj="importSavedObjectsConflictsWarning"
-        iconType="help"
-        title={
-          <FormattedMessage
-            defaultMessage="Index Pattern Conflicts"
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
-            values={Object {}}
-          />
-        }
-      >
-        <p>
-          <FormattedMessage
-            defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
-            values={
-              Object {
-                "indexPatternLink": <EuiLink
-                  href=""
-                >
-                  <FormattedMessage
-                    defaultMessage="create a new index pattern"
-                    id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
-                    values={Object {}}
-                  />
-                </EuiLink>,
-              }
+    <EuiSpacer
+      size="s"
+    />
+    <EuiCallOut
+      color="warning"
+      data-test-subj="importSavedObjectsLegacyWarning"
+      iconType="help"
+      title={
+        <FormattedMessage
+          defaultMessage="Support for JSON files is going away"
+          id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
+          values={Object {}}
+        />
+      }
+    >
+      <p>
+        <FormattedMessage
+          defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
+          id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
+          values={Object {}}
+        />
+      </p>
+    </EuiCallOut>
+    <EuiSpacer
+      size="m"
+    />
+    <EuiSpacer
+      size="s"
+    />
+    <EuiCallOut
+      color="warning"
+      data-test-subj="importSavedObjectsConflictsWarning"
+      iconType="help"
+      title={
+        <FormattedMessage
+          defaultMessage="Index Pattern Conflicts"
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
+          values={Object {}}
+        />
+      }
+    >
+      <p>
+        <FormattedMessage
+          defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
+          values={
+            Object {
+              "indexPatternLink": <EuiLink
+                href=""
+              >
+                <FormattedMessage
+                  defaultMessage="create a new index pattern"
+                  id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                  values={Object {}}
+                />
+              </EuiLink>,
             }
-          />
-        </p>
-      </EuiCallOut>
-    </span>
+          }
+        />
+      </p>
+    </EuiCallOut>
     <EuiInMemoryTable
       columns={
         Array [
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
index a890c6977de1..43cf0823c827 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
@@ -175,7 +175,9 @@ exports[`Relationships from legacy app should render errors 1`] = `
         />
       }
     >
-      foo
+      <p>
+        foo
+      </p>
     </EuiCallOut>
   </EuiFlyoutBody>
 </EuiFlyout>
@@ -944,7 +946,9 @@ exports[`Relationships should render errors 1`] = `
         />
       }
     >
-      foo
+      <p>
+        foo
+      </p>
     </EuiCallOut>
   </EuiFlyoutBody>
 </EuiFlyout>
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index b0dd8c269039..ad082513b277 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -917,18 +917,10 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
 
     return (
       <Fragment>
-        {legacyFileWarning && (
-          <span>
-            <EuiSpacer size="s" />
-            {legacyFileWarning}
-          </span>
-        )}
-        {indexPatternConflictsWarning && (
-          <span>
-            <EuiSpacer size="s" />
-            {indexPatternConflictsWarning}
-          </span>
-        )}
+        {legacyFileWarning && <EuiSpacer size="s" />}
+        {legacyFileWarning}
+        {indexPatternConflictsWarning && <EuiSpacer size="s" />}
+        {indexPatternConflictsWarning}
       </Fragment>
     );
   }
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
index 4b46c1244e24..99e824f3b4f3 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
@@ -14,7 +14,3 @@
 .savedObjectsManagementImportSummary__errorCount {
   color: $euiColorDangerText;
 }
-
-.savedObjectsManagementImportSummary__icon {
-  margin-left: $euiSizeXS;
-}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
index 68e1ffec8e3b..0115111da0ac 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
@@ -116,7 +116,7 @@ export class Relationships extends Component<RelationshipsProps, RelationshipsSt
         }
         color="danger"
       >
-        {error}
+        <p>{error}</p>
       </EuiCallOut>
     );
   }