diff --git a/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx b/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx
index 5f3a6b1465..397f2f8f6b 100644
--- a/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx
+++ b/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx
@@ -165,18 +165,18 @@ const PlatformWrapper = ({
     return (
       <div className={`${baseClass}__advanced--fleet-certificate`}>
         {type === "plain" ? (
-          <p className={`${baseClass}__advanced--heading`}>
+          <div className={`${baseClass}__advanced--heading`}>
             Download your Fleet certificate
-          </p>
+          </div>
         ) : (
-          <p
+          <div
             className={`${baseClass}__advanced--heading download-certificate--tooltip`}
           >
             Download your{" "}
             <TooltipWrapper tipContent="A Fleet certificate is required if Fleet is running with a self signed or otherwise untrusted certificate.">
               Fleet certificate:
             </TooltipWrapper>
-          </p>
+          </div>
         )}
         {isFetchingCertificate && (
           <p className={`${baseClass}__certificate-loading`}>
diff --git a/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss b/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss
index fbd148fcf6..a0db3376c0 100644
--- a/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss
+++ b/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss
@@ -167,9 +167,6 @@
 
   .download-certificate--tooltip {
     margin-bottom: 0;
-    div {
-      display: inline;
-    }
   }
 
   &__copy-message {
diff --git a/frontend/components/TooltipWrapper/_styles.scss b/frontend/components/TooltipWrapper/_styles.scss
index e6f2e5f4c5..efd837fd72 100644
--- a/frontend/components/TooltipWrapper/_styles.scss
+++ b/frontend/components/TooltipWrapper/_styles.scss
@@ -3,6 +3,7 @@
 
   &__element {
     white-space: nowrap;
+    line-height: initial;
   }
 
   &__underline {
diff --git a/frontend/pages/hosts/ManageHostsPage/_styles.scss b/frontend/pages/hosts/ManageHostsPage/_styles.scss
index 3bc1bf4a4e..0a3c62e2ef 100644
--- a/frontend/pages/hosts/ManageHostsPage/_styles.scss
+++ b/frontend/pages/hosts/ManageHostsPage/_styles.scss
@@ -285,14 +285,4 @@
       top: -2px;
     }
   }
-
-  .mdm_enrollment_status__header,
-  .mdm_server_url__header {
-    .last-col-header-with-tip {
-      width: 180px;
-    }
-    .component__tooltip-wrapper__tip-text {
-      left: -156px; // Wide tooltip needs to be shifted left (edge case example when it's second to last column)
-    }
-  }
 }
diff --git a/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx b/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx
index 86197be71f..d8badaf4c0 100644
--- a/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx
+++ b/frontend/pages/hosts/details/DeviceUserPage/DeviceUserPage.tsx
@@ -444,7 +444,6 @@ const DeviceUserPage = ({
                     aboutData={aboutData}
                     deviceMapping={deviceMapping}
                     munki={deviceMacAdminsData?.munki}
-                    wrapFleetHelper={wrapFleetHelper}
                   />
                 </TabPanel>
                 <TabPanel>
diff --git a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
index 3ecaa2f3a0..e2c7af8ac4 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/HostDetailsPage.tsx
@@ -719,7 +719,6 @@ const HostDetailsPage = ({
                 deviceMapping={deviceMapping}
                 munki={macadmins?.munki}
                 mdm={mdm}
-                wrapFleetHelper={wrapFleetHelper}
               />
               <div className="col-2">
                 <AgentOptionsCard
diff --git a/frontend/pages/hosts/details/cards/About/About.tsx b/frontend/pages/hosts/details/cards/About/About.tsx
index f1c30de2dd..3612f95739 100644
--- a/frontend/pages/hosts/details/cards/About/About.tsx
+++ b/frontend/pages/hosts/details/cards/About/About.tsx
@@ -16,7 +16,6 @@ interface IAboutProps {
   deviceMapping?: IDeviceUser[];
   munki?: IMunkiData | null;
   mdm?: IHostMdmData;
-  wrapFleetHelper: (helperFn: (value: any) => string, value: string) => string;
 }
 
 const About = ({
diff --git a/frontend/utilities/constants.ts b/frontend/utilities/constants.tsx
similarity index 90%
rename from frontend/utilities/constants.ts
rename to frontend/utilities/constants.tsx
index 61fb0bc4e1..c4e765220f 100644
--- a/frontend/utilities/constants.ts
+++ b/frontend/utilities/constants.tsx
@@ -2,6 +2,7 @@ import URL_PREFIX from "router/url_prefix";
 import { OsqueryPlatform } from "interfaces/platform";
 import paths from "router/paths";
 import { ISchedulableQuery } from "interfaces/schedulable_query";
+import React from "react";
 
 const { origin } = global.window.location;
 export const BASE_URL = `${origin}${URL_PREFIX}/api`;
@@ -262,11 +263,30 @@ export const VULNERABLE_DROPDOWN_OPTIONS = [
 ];
 
 // Keys from API
-export const MDM_STATUS_TOOLTIP: Record<string, string> = {
-  "On (automatic)": `<span>MDM was turned on automatically using Apple Automated Device Enrollment (DEP), Windows Autopilot, or Windows Azure AD Join. Administrators can block end users from turning MDM off.</span>`,
-  "On (manual)": `<span>MDM was turned on manually. End users can turn MDM off.</span>`,
-  Off: `<span>Hosts with MDM off don&apos;t receive macOS <br /> settings and macOS update encouragement.</span>`,
-  Pending: `<span>Hosts ordered via Apple Business Manager <br /> (ABM). These will automatically enroll to Fleet <br /> and turn on MDM when they&apos;re unboxed.</span>`,
+export const MDM_STATUS_TOOLTIP: Record<string, string | React.ReactNode> = {
+  "On (automatic)": (
+    <span>
+      MDM was turned on automatically using Apple Automated Device Enrollment
+      (DEP), Windows Autopilot, or Windows Azure AD Join. Administrators can
+      block end users from turning MDM off.
+    </span>
+  ),
+  "On (manual)": (
+    <span>MDM was turned on manually. End users can turn MDM off.</span>
+  ),
+  Off: (
+    <span>
+      Hosts with MDM off don&apos;t receive macOS <br /> settings and macOS
+      update encouragement.
+    </span>
+  ),
+  Pending: (
+    <span>
+      Hosts ordered via Apple Business Manager <br /> (ABM). These will
+      automatically enroll to Fleet <br /> and turn on MDM when they&apos;re
+      unboxed.
+    </span>
+  ),
 };
 
 export const DEFAULT_CREATE_USER_ERRORS = {