diff --git a/changes/issue-6617-spiffier-tooltips b/changes/issue-6617-6835-spiffier-tooltips
similarity index 100%
rename from changes/issue-6617-spiffier-tooltips
rename to changes/issue-6617-6835-spiffier-tooltips
diff --git a/frontend/components/forms/fields/Checkbox/Checkbox.tsx b/frontend/components/forms/fields/Checkbox/Checkbox.tsx
index 31191a26a5..c7e7e1c703 100644
--- a/frontend/components/forms/fields/Checkbox/Checkbox.tsx
+++ b/frontend/components/forms/fields/Checkbox/Checkbox.tsx
@@ -77,7 +77,7 @@ const Checkbox = (props: ICheckboxProps) => {
         <span className={checkBoxTickClass} />
 
         {tooltip ? (
-          <span className={`${checkBoxClass}__label-tooltip`}>
+          <span className={`${checkBoxClass}__label-tooltip tooltip`}>
             <TooltipWrapper tipContent={tooltip}>
               {children as string}
             </TooltipWrapper>
diff --git a/frontend/pages/admin/IntegrationsPage/components/IntegrationForm/IntegrationForm.tsx b/frontend/pages/admin/IntegrationsPage/components/IntegrationForm/IntegrationForm.tsx
index ecc580b0fd..8be3992555 100644
--- a/frontend/pages/admin/IntegrationsPage/components/IntegrationForm/IntegrationForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/components/IntegrationForm/IntegrationForm.tsx
@@ -256,6 +256,7 @@ const IntegrationForm = ({
                 formData.apiToken === "" ||
                 formData.groupId === 0)
           }
+          className={"tooltip"}
         >
           <Button
             className={`${baseClass}__btn`}
diff --git a/frontend/pages/hosts/details/DeviceUserPage/_styles.scss b/frontend/pages/hosts/details/DeviceUserPage/_styles.scss
index 2870a4f140..98a2e62e28 100644
--- a/frontend/pages/hosts/details/DeviceUserPage/_styles.scss
+++ b/frontend/pages/hosts/details/DeviceUserPage/_styles.scss
@@ -172,7 +172,6 @@
       margin-right: $pad-small;
 
       .refetch-btn {
-        cursor: default;
         font-size: $x-small;
         height: 38px;
         margin-right: $pad-small;
@@ -185,10 +184,6 @@
           transform: scale(0.5);
           height: 28px;
         }
-
-        &:hover {
-          cursor: pointer;
-        }
       }
 
       .refetch-offline {
diff --git a/frontend/pages/hosts/details/HostDetailsPage/_styles.scss b/frontend/pages/hosts/details/HostDetailsPage/_styles.scss
index 4d0acf3a1d..74a1bd2a4f 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/_styles.scss
+++ b/frontend/pages/hosts/details/HostDetailsPage/_styles.scss
@@ -185,10 +185,6 @@
           transform: scale(0.5);
           height: 28px;
         }
-
-        &:hover {
-          cursor: pointer;
-        }
       }
 
       .refetch-offline {
diff --git a/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx b/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx
index 4b3f0ec180..eecf8ef268 100644
--- a/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SoftwareTableConfig.tsx
@@ -250,7 +250,7 @@ export const generateSoftwareTableHeaders = (
           <>
             <span
               className={`last-used ${
-                lastUsed === "Unavailable" ? "text-muted" : ""
+                lastUsed === "Unavailable" ? "text-muted tooltip" : ""
               }`}
               data-tip
               data-for={`last_used__${cellProps.row.original.id}`}
diff --git a/frontend/pages/software/ManageSoftwarePage/SoftwareTableConfig.tsx b/frontend/pages/software/ManageSoftwarePage/SoftwareTableConfig.tsx
index eb32463696..dcf40faeb4 100644
--- a/frontend/pages/software/ManageSoftwarePage/SoftwareTableConfig.tsx
+++ b/frontend/pages/software/ManageSoftwarePage/SoftwareTableConfig.tsx
@@ -153,7 +153,7 @@ const generateVulnColumnHeader = () => {
         <>
           <span
             className={`text-cell vulnerabilities ${
-              vulnerabilities.length > 1 ? "text-muted" : ""
+              vulnerabilities.length > 1 ? "text-muted tooltip" : ""
             }`}
             data-tip
             data-for={`vulnerabilities__${cellProps.row.original.id}`}
diff --git a/frontend/styles/global/_global.scss b/frontend/styles/global/_global.scss
index 23591540dd..e9f354a6c4 100644
--- a/frontend/styles/global/_global.scss
+++ b/frontend/styles/global/_global.scss
@@ -24,12 +24,17 @@ body {
     text-align: center;
   }
 
-  .button--disabled,
-  .fleet-checkbox__tick--disabled,
   .tooltip {
     &:hover {
       cursor: help;
     }
+
+    .button--disabled,
+    .fleet-checkbox__tick--disabled {
+      &:hover {
+        cursor: help;
+      }
+    }
   }
 }