diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_delete_provider.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_delete_provider.tsx
index 96bbc5b82565e..b6934dc418399 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_delete_provider.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/agent_policy_delete_provider.tsx
@@ -117,10 +117,12 @@ export const AgentPolicyDeleteProvider: React.FunctionComponent<Props> = ({
     return (
       <EuiConfirmModal
         title={
-          <FormattedMessage
-            id="xpack.fleet.deleteAgentPolicy.confirmModal.deletePolicyTitle"
-            defaultMessage="Delete this agent policy?"
-          />
+          <span>
+            <FormattedMessage
+              id="xpack.fleet.deleteAgentPolicy.confirmModal.deletePolicyTitle"
+              defaultMessage="Delete this agent policy?"
+            />
+          </span>
         }
         onCancel={closeModal}
         onConfirm={deleteAgentPolicy}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/confirm_deploy_modal.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/confirm_deploy_modal.tsx
index 1198db3034dee..85e60e23d7faa 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/confirm_deploy_modal.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/confirm_deploy_modal.tsx
@@ -21,10 +21,12 @@ export const ConfirmDeployAgentPolicyModal: React.FunctionComponent<{
   return (
     <EuiConfirmModal
       title={
-        <FormattedMessage
-          id="xpack.fleet.agentPolicy.confirmModalTitle"
-          defaultMessage="Save and deploy changes"
-        />
+        <span>
+          <FormattedMessage
+            id="xpack.fleet.agentPolicy.confirmModalTitle"
+            defaultMessage="Save and deploy changes"
+          />
+        </span>
       }
       onCancel={onCancel}
       onConfirm={onConfirm}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/post_install_add_agent_modal.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/post_install_add_agent_modal.tsx
index 18be0df355395..9bca17efb0f38 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/post_install_add_agent_modal.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/components/post_install_add_agent_modal.tsx
@@ -36,13 +36,15 @@ export const PostInstallAddAgentModal: React.FunctionComponent<{
     <EuiModal data-test-subj="postInstallAddAgentModal" onClose={onCancel}>
       <EuiModalHeader>
         <EuiModalHeaderTitle data-test-subj="confirmModalTitleText">
-          <FormattedMessage
-            id="xpack.fleet.agentPolicy.postInstallAddAgentModal"
-            defaultMessage="{packageName} integration added"
-            values={{
-              packageName: toTitleCase(packageInfo.title),
-            }}
-          />
+          <h1>
+            <FormattedMessage
+              id="xpack.fleet.agentPolicy.postInstallAddAgentModal"
+              defaultMessage="{packageName} integration added"
+              values={{
+                packageName: toTitleCase(packageInfo.title),
+              }}
+            />
+          </h1>
         </EuiModalHeaderTitle>
       </EuiModalHeader>
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_reassign_policy_modal/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_reassign_policy_modal/index.tsx
index cb3f0d77eed34..06c659662b1b0 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_reassign_policy_modal/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_reassign_policy_modal/index.tsx
@@ -102,10 +102,12 @@ export const AgentReassignAgentPolicyModal: React.FunctionComponent<Props> = ({
     <EuiConfirmModal
       data-test-subj="agentReassignPolicyModal"
       title={
-        <FormattedMessage
-          id="xpack.fleet.agentReassignPolicy.flyoutTitle"
-          defaultMessage="Assign new agent policy"
-        />
+        <span>
+          <FormattedMessage
+            id="xpack.fleet.agentReassignPolicy.flyoutTitle"
+            defaultMessage="Assign new agent policy"
+          />
+        </span>
       }
       onCancel={onClose}
       onConfirm={onSubmit}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx
index d5bb9adf040b2..d326c80f10f6d 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_request_diagnostics_modal/index.tsx
@@ -79,16 +79,20 @@ export const AgentRequestDiagnosticsModal: React.FunctionComponent<Props> = ({
       data-test-subj="requestDiagnosticsModal"
       title={
         isSingleAgent ? (
-          <FormattedMessage
-            id="xpack.fleet.requestDiagnostics.singleTitle"
-            defaultMessage="Request diagnostics"
-          />
+          <span>
+            <FormattedMessage
+              id="xpack.fleet.requestDiagnostics.singleTitle"
+              defaultMessage="Request diagnostics"
+            />
+          </span>
         ) : (
-          <FormattedMessage
-            id="xpack.fleet.requestDiagnostics.multipleTitle"
-            defaultMessage="Request diagnostics for {count} agents"
-            values={{ count: agentCount }}
-          />
+          <span>
+            <FormattedMessage
+              id="xpack.fleet.requestDiagnostics.multipleTitle"
+              defaultMessage="Request diagnostics for {count} agents"
+              values={{ count: agentCount }}
+            />
+          </span>
         )
       }
       onCancel={onClose}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx
index 72b1e00c1ed02..df2d617770493 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_unenroll_modal/index.tsx
@@ -88,16 +88,20 @@ export const AgentUnenrollAgentModal: React.FunctionComponent<Props> = ({
       data-test-subj="agentUnenrollModal"
       title={
         isSingleAgent ? (
-          <FormattedMessage
-            id="xpack.fleet.unenrollAgents.deleteSingleTitle"
-            defaultMessage="Unenroll agent"
-          />
+          <span>
+            <FormattedMessage
+              id="xpack.fleet.unenrollAgents.deleteSingleTitle"
+              defaultMessage="Unenroll agent"
+            />
+          </span>
         ) : (
-          <FormattedMessage
-            id="xpack.fleet.unenrollAgents.forceDeleteMultipleTitle"
-            defaultMessage="Unenroll {count} agents"
-            values={{ count: agentCount }}
-          />
+          <span>
+            <FormattedMessage
+              id="xpack.fleet.unenrollAgents.forceDeleteMultipleTitle"
+              defaultMessage="Unenroll {count} agents"
+              values={{ count: agentCount }}
+            />
+          </span>
         )
       }
       onCancel={onClose}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
index c852d9b1ad2a2..b35d14757c1cc 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_upgrade_modal/index.tsx
@@ -225,22 +225,28 @@ export const AgentUpgradeAgentModal: React.FunctionComponent<AgentUpgradeAgentMo
       title={
         <>
           {isSingleAgent ? (
-            <FormattedMessage
-              id="xpack.fleet.upgradeAgents.upgradeSingleTitle"
-              defaultMessage="Upgrade agent"
-            />
+            <span>
+              <FormattedMessage
+                id="xpack.fleet.upgradeAgents.upgradeSingleTitle"
+                defaultMessage="Upgrade agent"
+              />
+            </span>
           ) : isScheduled ? (
-            <FormattedMessage
-              id="xpack.fleet.upgradeAgents.scheduleUpgradeMultipleTitle"
-              defaultMessage="Schedule upgrade for {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
-              values={{ count: isAllAgents || agentCount }}
-            />
+            <span>
+              <FormattedMessage
+                id="xpack.fleet.upgradeAgents.scheduleUpgradeMultipleTitle"
+                defaultMessage="Schedule upgrade for {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
+                values={{ count: isAllAgents || agentCount }}
+              />
+            </span>
           ) : (
-            <FormattedMessage
-              id="xpack.fleet.upgradeAgents.upgradeMultipleTitle"
-              defaultMessage="Upgrade {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
-              values={{ count: isAllAgents || agentCount }}
-            />
+            <span>
+              <FormattedMessage
+                id="xpack.fleet.upgradeAgents.upgradeMultipleTitle"
+                defaultMessage="Upgrade {count, plural, one {agent} other {{count} agents} =true {all selected agents}}"
+                values={{ count: isAllAgents || agentCount }}
+              />
+            </span>
           )}
         </>
       }
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx
index 31e4fc32233e9..a6f91c166e3e2 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx
@@ -20,11 +20,13 @@ export const ConfirmPackageInstall = (props: ConfirmPackageInstallProps) => {
   return (
     <EuiConfirmModal
       title={
-        <FormattedMessage
-          id="xpack.fleet.integrations.settings.confirmInstallModal.installTitle"
-          defaultMessage="Install {packageName}"
-          values={{ packageName }}
-        />
+        <span>
+          <FormattedMessage
+            id="xpack.fleet.integrations.settings.confirmInstallModal.installTitle"
+            defaultMessage="Install {packageName}"
+            values={{ packageName }}
+          />
+        </span>
       }
       onCancel={onCancel}
       onConfirm={onConfirm}
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx
index a029aab3e2b1d..950d2bca36637 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx
@@ -20,11 +20,13 @@ export const ConfirmPackageUninstall = (props: ConfirmPackageUninstallProps) =>
   return (
     <EuiConfirmModal
       title={
-        <FormattedMessage
-          id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallTitle"
-          defaultMessage="Uninstall {packageName}"
-          values={{ packageName }}
-        />
+        <span>
+          <FormattedMessage
+            id="xpack.fleet.integrations.settings.confirmUninstallModal.uninstallTitle"
+            defaultMessage="Uninstall {packageName}"
+            values={{ packageName }}
+          />
+        </span>
       }
       onCancel={onCancel}
       onConfirm={onConfirm}
diff --git a/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx b/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx
index 683ba398f6669..654323e5ab0e6 100644
--- a/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx
+++ b/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx
@@ -146,11 +146,13 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
     return (
       <EuiConfirmModal
         title={
-          <FormattedMessage
-            id="xpack.fleet.deletePackagePolicy.confirmModal.deleteMultipleTitle"
-            defaultMessage="Delete {count, plural, one {integration} other {# integrations}}?"
-            values={{ count: packagePolicies.length }}
-          />
+          <span>
+            <FormattedMessage
+              id="xpack.fleet.deletePackagePolicy.confirmModal.deleteMultipleTitle"
+              defaultMessage="Delete {count, plural, one {integration} other {# integrations}}?"
+              values={{ count: packagePolicies.length }}
+            />
+          </span>
         }
         onCancel={closeModal}
         onConfirm={deletePackagePolicies}