diff --git a/changes/49276-secondary-subdued-button-styles b/changes/49276-secondary-subdued-button-styles
new file mode 100644
index 0000000000..a37b2bfb35
--- /dev/null
+++ b/changes/49276-secondary-subdued-button-styles
@@ -0,0 +1 @@
+- Updated button styles across the Fleet UI to use the new bordered secondary and subdued button variants.
diff --git a/frontend/components/ActionsDropdown/ActionsDropdown.tsx b/frontend/components/ActionsDropdown/ActionsDropdown.tsx
index 5acd15e0be..6b88c40d1c 100644
--- a/frontend/components/ActionsDropdown/ActionsDropdown.tsx
+++ b/frontend/components/ActionsDropdown/ActionsDropdown.tsx
@@ -29,7 +29,9 @@ interface IActionsDropdownProps {
   className?: string;
   menuAlign?: "right" | "left" | "default";
   menuPlacement?: "top" | "bottom" | "auto";
-  variant?: "button" | "brand-button" | "small-button";
+  /** Mirrors Fleet's Primary/Secondary/Subdued button styles — see #35329.
+   *  Default: "subdued" */
+  variant?: "primary" | "secondary" | "subdued";
   buttonLabel?: string;
 }
 
@@ -37,6 +39,10 @@ const getOptionBackgroundColor = (state: { isFocused: boolean }) => {
   return state.isFocused ? COLORS["ui-fleet-black-5"] : "transparent";
 };
 
+const getControlBackgroundColor = (variant: string | undefined) => {
+  return variant === "secondary" ? COLORS["ui-off-white"] : "initial";
+};
+
 const getLeftMenuAlign = (menuAlign: "right" | "left" | "default") => {
   switch (menuAlign) {
     case "right":
@@ -63,13 +69,15 @@ const CustomDropdownIndicator = (
   props: DropdownIndicatorProps<IDropdownOption, false>
 ) => {
   const { isFocused, selectProps } = props;
-  const variant = (selectProps as { variant?: "button" }).variant;
+  const variant = (selectProps as {
+    variant?: "primary" | "secondary" | "subdued";
+  }).variant;
 
   const color =
     isFocused ||
     selectProps.menuIsOpen ||
-    variant === "button" ||
-    variant === "small-button"
+    variant === "subdued" ||
+    variant === "secondary"
       ? "ui-fleet-black-75"
       : "core-fleet-black";
 
@@ -78,6 +86,7 @@ const CustomDropdownIndicator = (
       <Icon
         name="chevron-down"
         color={color}
+        size={variant === "secondary" ? "small" : undefined}
         className={`${baseClass}__icon`}
       />
     </components.DropdownIndicator>
@@ -90,6 +99,7 @@ const CustomOption: React.FC<OptionProps<IDropdownOption, false>> = (props) => {
   const optionContent = (
     <div
       className={`${baseClass}__option`}
+      data-testid="dropdown-option"
       ref={innerRef}
       tabIndex={isDisabled ? -1 : 0} // Tabbing skipped when disabled
       aria-disabled={isDisabled}
@@ -123,23 +133,50 @@ const ActionsDropdown = ({
   className,
   menuAlign = "default",
   menuPlacement = "bottom",
-  variant,
+  variant = "subdued",
   buttonLabel,
 }: IActionsDropdownProps): JSX.Element => {
   const dropdownClassnames = classnames(baseClass, className);
 
   // Portal the menu only when rendered inside a TableContainer's data-table
   // block, where .data-table__wrapper's overflow-x: auto would otherwise clip
-  // the menu vertically. The brand-button variant nulls out react-select's
+  // the menu vertically. The primary variant nulls out react-select's
   // Control, and MenuPortal bails when controlElement is missing — so don't
-  // use brand-button inside a table cell.
+  // use primary inside a table cell.
   const { insideTable } = useContext(TableLayoutContext);
 
-  // Used for brand Action button
+  // Used for the primary Action button
   const [menuIsOpen, setMenuIsOpen] = useState(false);
   const selectRef = useRef<SelectInstance<IDropdownOption, false>>(null);
   const wrapperRef = useRef<HTMLDivElement>(null);
 
+  // react-select's hidden input always matches :focus-visible, even on a
+  // mouse click (browsers treat text inputs specially), so CSS alone can't
+  // tell a Tab-focus apart from a click. Track the last input method
+  // ourselves — same approach as UserMenu.tsx — so the focus ring only
+  // shows up for keyboard tabbing.
+  const [isKeyboardFocus, setIsKeyboardFocus] = useState(false);
+
+  useEffect(() => {
+    const handleKeyDown = (e: KeyboardEvent) => {
+      if (e.key === "Tab") {
+        setIsKeyboardFocus(true);
+      }
+    };
+
+    const handleMouseDown = () => {
+      setIsKeyboardFocus(false);
+    };
+
+    document.addEventListener("keydown", handleKeyDown);
+    document.addEventListener("mousedown", handleMouseDown);
+
+    return () => {
+      document.removeEventListener("keydown", handleKeyDown);
+      document.removeEventListener("mousedown", handleMouseDown);
+    };
+  }, []);
+
   // Close on outside click
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
@@ -164,11 +201,11 @@ const ActionsDropdown = ({
     };
   }, [menuIsOpen]);
 
-  const isBrandButton = variant === "brand-button";
+  const isPrimary = variant === "primary";
 
   // CustomControl rerenders on state change, preventing arrow animation
-  // Render brand button outside of CustomControl instead
-  const renderBrandButton = () => (
+  // Render primary button outside of CustomControl instead
+  const renderPrimaryButton = () => (
     <Button
       type="button"
       onClick={() => setMenuIsOpen((v) => !v)}
@@ -202,10 +239,14 @@ const ActionsDropdown = ({
       flexDirection: "row",
       width: "max-content",
       // Need minHeight to override default
-      minHeight: variant === "small-button" ? "20px" : "32px", // Match button height
-      padding: variant === "small-button" ? "4px" : "8px", // Match button padding
-      backgroundColor: state.isFocused ? COLORS["ui-fleet-black-5"] : "initial",
-      border: 0,
+      minHeight: variant === "secondary" ? "28px" : "32px", // Match button height
+      padding: variant === "secondary" ? "4px 8px" : "8px", // Match button padding
+      backgroundColor: getControlBackgroundColor(variant),
+      border:
+        variant === "secondary"
+          ? `1px solid ${COLORS["ui-fleet-black-25"]}` // Match secondary button border — see #35329
+          : 0,
+      boxSizing: "border-box",
       boxShadow: "none",
       cursor: "pointer",
       "&:hover": {
@@ -219,33 +260,37 @@ const ActionsDropdown = ({
         },
       },
       "&:active": {
-        background: COLORS["ui-fleet-black-5"], // Match button hover
+        background:
+          variant === "secondary"
+            ? COLORS["ui-fleet-black-10"] // Match secondary button active — see #35329
+            : COLORS["ui-fleet-black-5"], // Match button hover
         ".actions-dropdown-select__indicator path": {
           stroke: COLORS["ui-fleet-black-75-down"],
         },
       },
-      // TODO: Figure out a way to apply separate &:focus-visible styling
-      // Currently only relying on &:focus styling for tabbing through app
       ...(state.menuIsOpen && {
         background: COLORS["ui-fleet-black-5"], // Match button hover
-        ".actions-dropdown-select__indicators": {
-          height: "20px",
-        },
         ".actions-dropdown-select__indicator svg": {
           transform: "rotate(180deg)",
           transition: "transform 0.25s ease",
         },
       }),
+      // Same ring Button's :focus-visible draws — only for keyboard tabbing,
+      // never a mouse click (see isKeyboardFocus above).
+      ...(state.isFocused &&
+        isKeyboardFocus && {
+          boxShadow: `0 0 0 1px ${COLORS["core-fleet-black"]}`,
+        }),
     }),
     placeholder: (provided, state) => ({
       ...provided,
       color:
-        state.isFocused || variant === "button" || variant === "small-button"
+        state.isFocused || variant === "subdued" || variant === "secondary"
           ? COLORS["ui-fleet-black-75"]
           : COLORS["core-fleet-black"],
       fontSize: "14px",
       fontWeight:
-        variant === "button" || variant === "small-button" ? "600" : undefined,
+        variant === "subdued" || variant === "secondary" ? "600" : undefined,
       lineHeight: "normal",
       paddingLeft: 0,
       marginTop: "1px",
@@ -269,11 +314,11 @@ const ActionsDropdown = ({
     menu: (provided) => ({
       ...provided,
       backgroundColor: COLORS["core-fleet-white"],
-      boxShadow: `0 2px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px var(--dropdown-menu-outline, transparent)`,
+      boxShadow: `0 2px 6px rgba(0, 0, 0, 0.1), 0 0 0 1px ${COLORS["ui-fleet-black-10"]}`,
       borderRadius: "4px",
       zIndex: 6,
       border: 0,
-      marginTop: isBrandButton ? "20px" : "0",
+      marginTop: isPrimary ? "20px" : "0",
       width: "auto",
       minWidth: "100%",
       position: "absolute",
@@ -323,25 +368,25 @@ const ActionsDropdown = ({
 
   return (
     <div className={`${baseClass}__wrapper`} ref={wrapperRef}>
-      {isBrandButton && renderBrandButton()}
+      {isPrimary && renderPrimaryButton()}
       <Select<IDropdownOption, false>
         ref={selectRef}
         options={options}
-        placeholder={isBrandButton ? "" : placeholder}
+        placeholder={isPrimary ? "" : placeholder}
         onChange={handleChange}
         isDisabled={disabled}
         isSearchable={isSearchable}
         styles={customStyles}
         menuIsOpen={menuIsOpen}
-        onMenuOpen={() => setMenuIsOpen(true)} // Needed abstraction for brand-action button
-        onMenuClose={() => setMenuIsOpen(false)} // Needed abstraction for brand-action-button
+        onMenuOpen={() => setMenuIsOpen(true)} // Needed abstraction for the primary Action button
+        onMenuClose={() => setMenuIsOpen(false)} // Needed abstraction for the primary Action button
         components={{
           DropdownIndicator: CustomDropdownIndicator,
           IndicatorSeparator: () => null,
           Option: CustomOption,
           SingleValue: () => null, // Doesn't replace placeholder text with selected text
           // Note: react-select doesn't support skipping disabled options when keyboarding through
-          ...(isBrandButton && { Control: () => null }), // Remove Control entirely and renderBrandButton instead
+          ...(isPrimary && { Control: () => null }), // Remove Control entirely and renderPrimaryButton instead
         }}
         controlShouldRenderValue={false} // Doesn't change placeholder text to selected text
         isOptionSelected={() => false} // Hides any styling on selected option
@@ -351,7 +396,7 @@ const ActionsDropdown = ({
         isOptionDisabled={(option) => !!option.disabled}
         menuPlacement={menuPlacement}
         menuPortalTarget={insideTable ? document.body : undefined}
-        {...{ variant }} // Allows CustomDropdownIndicator to be ui-fleet-black-75 for variant: "button"
+        {...{ variant }} // Allows CustomDropdownIndicator to be ui-fleet-black-75 for variant: "subdued"
       />
     </div>
   );
diff --git a/frontend/components/ActionsDropdown/_styles.scss b/frontend/components/ActionsDropdown/_styles.scss
index a9ea9d8ec7..f91a43abed 100644
--- a/frontend/components/ActionsDropdown/_styles.scss
+++ b/frontend/components/ActionsDropdown/_styles.scss
@@ -1,9 +1,10 @@
-// All other styling in customStyles part of react-select-5
-.actions-dropdown-select__control {
-  &:focus-visible {
-    background-color: $ui-fleet-black-75;
-  }
-}
+// All other styling in customStyles part of react-select-5.
+//
+// The keyboard-focus ring specifically lives there too, not here — a plain
+// CSS `:focus-visible` (even via `:has(input:focus-visible)`) fires on a
+// mouse click as well as Tab, because browsers always treat a focused text
+// input as focus-visible. customStyles tracks the last input method itself
+// (see isKeyboardFocus in ActionsDropdown.tsx) to tell them apart.
 
 .actions-dropdown__wrapper {
   display: flex;
diff --git a/frontend/components/ActivityDetails/InstallDetails/CertificateInstallDetailsModal/CertificateInstallDetailsModal.tsx b/frontend/components/ActivityDetails/InstallDetails/CertificateInstallDetailsModal/CertificateInstallDetailsModal.tsx
index 4345d067ca..ff103e0d60 100644
--- a/frontend/components/ActivityDetails/InstallDetails/CertificateInstallDetailsModal/CertificateInstallDetailsModal.tsx
+++ b/frontend/components/ActivityDetails/InstallDetails/CertificateInstallDetailsModal/CertificateInstallDetailsModal.tsx
@@ -57,6 +57,7 @@ const CertificateInstallDetailsModal = ({
               hideText="Details"
               caretPosition="after"
               onClick={() => setShowDetails((prev) => !prev)}
+              variant="secondary"
             />
             {showDetails && (
               <Textarea label="Error details:" variant="code">
diff --git a/frontend/components/ActivityDetails/InstallDetails/SoftwareInstallDetailsModal/SoftwareInstallDetailsModal.tsx b/frontend/components/ActivityDetails/InstallDetails/SoftwareInstallDetailsModal/SoftwareInstallDetailsModal.tsx
index 3845bb801e..50edda35be 100644
--- a/frontend/components/ActivityDetails/InstallDetails/SoftwareInstallDetailsModal/SoftwareInstallDetailsModal.tsx
+++ b/frontend/components/ActivityDetails/InstallDetails/SoftwareInstallDetailsModal/SoftwareInstallDetailsModal.tsx
@@ -217,7 +217,7 @@ export const ModalButtons = ({
       <ModalFooter
         primaryButtons={
           <>
-            <Button variant="inverse" onClick={onCancel}>
+            <Button variant="secondary" onClick={onCancel}>
               Cancel
             </Button>
             <Button type="submit" onClick={onClickRetry}>
@@ -324,6 +324,7 @@ export const SoftwareInstallDetailsModal = ({
             hideText="Details"
             caretPosition="after"
             onClick={toggleInstallDetails}
+            variant="secondary"
           />
         )}
         {showInstallDetails &&
@@ -471,6 +472,7 @@ export const SoftwareInstallDetailsModal = ({
                   />
                   <CopyButton
                     copyText={swInstallResult.hash_sha256}
+                    variant="subdued"
                     ariaLabel="Copy hash to clipboard"
                   />
                 </>
diff --git a/frontend/components/ActivityDetails/InstallDetails/SoftwareIpaInstallDetailsModal/SoftwareIpaInstallDetailsModal.tsx b/frontend/components/ActivityDetails/InstallDetails/SoftwareIpaInstallDetailsModal/SoftwareIpaInstallDetailsModal.tsx
index bf3281119e..ba9394d2b9 100644
--- a/frontend/components/ActivityDetails/InstallDetails/SoftwareIpaInstallDetailsModal/SoftwareIpaInstallDetailsModal.tsx
+++ b/frontend/components/ActivityDetails/InstallDetails/SoftwareIpaInstallDetailsModal/SoftwareIpaInstallDetailsModal.tsx
@@ -244,7 +244,7 @@ export const ModalButtons = ({
       <ModalFooter
         primaryButtons={
           <>
-            <Button variant="inverse" onClick={onCancel}>
+            <Button variant="secondary" onClick={onCancel}>
               Cancel
             </Button>
             <Button type="submit" onClick={onClickRetry}>
@@ -473,6 +473,7 @@ export const SoftwareIpaInstallDetailsModal = ({
           hideText="Details"
           caretPosition="after"
           onClick={toggleInstallDetails}
+          variant="secondary"
         />
         {showInstallDetails && (
           <>
@@ -506,6 +507,7 @@ export const SoftwareIpaInstallDetailsModal = ({
           hideText="Details"
           caretPosition="after"
           onClick={toggleInstallDetails}
+          variant="secondary"
         />
         {showInstallDetails && (
           <Textarea label="Error details:" variant="code">
diff --git a/frontend/components/ActivityDetails/InstallDetails/SoftwareScriptDetailsModal/SoftwareScriptDetailsModal.tsx b/frontend/components/ActivityDetails/InstallDetails/SoftwareScriptDetailsModal/SoftwareScriptDetailsModal.tsx
index ff8b4cad25..0d8270416f 100644
--- a/frontend/components/ActivityDetails/InstallDetails/SoftwareScriptDetailsModal/SoftwareScriptDetailsModal.tsx
+++ b/frontend/components/ActivityDetails/InstallDetails/SoftwareScriptDetailsModal/SoftwareScriptDetailsModal.tsx
@@ -167,7 +167,7 @@ export const ModalButtons = ({
       <ModalFooter
         primaryButtons={
           <>
-            <Button variant="inverse" onClick={onCancel}>
+            <Button variant="secondary" onClick={onCancel}>
               Cancel
             </Button>
             <Button type="submit" onClick={onClickRerun}>
@@ -241,6 +241,7 @@ export const SoftwareScriptDetailsModal = ({
             hideText="Details"
             caretPosition="after"
             onClick={toggleInstallDetails}
+            variant="secondary"
           />
         )}
         {showInstallDetails && swInstallResult?.output && (
diff --git a/frontend/components/ActivityDetails/InstallDetails/SoftwareUninstallDetailsModal/SoftwareUninstallDetailsModal.tsx b/frontend/components/ActivityDetails/InstallDetails/SoftwareUninstallDetailsModal/SoftwareUninstallDetailsModal.tsx
index 65ac189db2..b5a49caf30 100644
--- a/frontend/components/ActivityDetails/InstallDetails/SoftwareUninstallDetailsModal/SoftwareUninstallDetailsModal.tsx
+++ b/frontend/components/ActivityDetails/InstallDetails/SoftwareUninstallDetailsModal/SoftwareUninstallDetailsModal.tsx
@@ -125,7 +125,7 @@ export const ModalButtons = ({
       <ModalFooter
         primaryButtons={
           <>
-            <Button variant="inverse" onClick={onCancel}>
+            <Button variant="secondary" onClick={onCancel}>
               Cancel
             </Button>
             <Button type="submit" onClick={onClickRetry}>
@@ -248,6 +248,7 @@ const SoftwareUninstallDetailsModal = ({
             hideText="Details"
             caretPosition="after"
             onClick={toggleDetails}
+            variant="secondary"
           />
         )}
         {showDetails && uninstallResult?.script_contents && (
diff --git a/frontend/components/ActivityDetails/InstallDetails/VppInstallDetailsModal/VppInstallDetailsModal.tsx b/frontend/components/ActivityDetails/InstallDetails/VppInstallDetailsModal/VppInstallDetailsModal.tsx
index 46337474af..28b766c0e7 100644
--- a/frontend/components/ActivityDetails/InstallDetails/VppInstallDetailsModal/VppInstallDetailsModal.tsx
+++ b/frontend/components/ActivityDetails/InstallDetails/VppInstallDetailsModal/VppInstallDetailsModal.tsx
@@ -292,7 +292,7 @@ export const ModalButtons = ({
       <ModalFooter
         primaryButtons={
           <>
-            <Button variant="inverse" onClick={onCancel}>
+            <Button variant="secondary" onClick={onCancel}>
               Cancel
             </Button>
             <Button type="submit" onClick={onClickRetry}>
@@ -535,6 +535,7 @@ export const VppInstallDetailsModal = ({
           hideText="Details"
           caretPosition="after"
           onClick={toggleInstallDetails}
+          variant="secondary"
         />
         {showInstallDetails && (
           <>
@@ -568,6 +569,7 @@ export const VppInstallDetailsModal = ({
           hideText="Details"
           caretPosition="after"
           onClick={toggleInstallDetails}
+          variant="secondary"
         />
         {showInstallDetails && (
           <Textarea label="Error details:" variant="code">
diff --git a/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx b/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx
index e450f35262..d6b2c3260c 100644
--- a/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx
+++ b/frontend/components/AddHostsModal/PlatformWrapper/PlatformWrapper.tsx
@@ -198,7 +198,7 @@ const PlatformWrapper = ({
                 </>
               )}
               <Button
-                variant="inverse"
+                variant="secondary"
                 className={`${baseClass}__fleet-certificate-download`}
                 onClick={onDownloadCertificate}
               >
@@ -382,6 +382,7 @@ const PlatformWrapper = ({
             showText="Plain osquery"
             caretPosition="after"
             onClick={() => setShowPlainOsquery((prev) => !prev)}
+            variant="secondary"
           />
           {showPlainOsquery && (
             <>
@@ -393,13 +394,9 @@ const PlatformWrapper = ({
                   Osquery uses an enroll secret to authenticate with the Fleet
                   server.
                   <br />
-                  <Button variant="inverse" onClick={onDownloadEnrollSecret}>
+                  <Button variant="secondary" onClick={onDownloadEnrollSecret}>
                     Download
-                    <Icon
-                      name="download"
-                      color="ui-fleet-black-75"
-                      size="small"
-                    />
+                    <Icon name="download" size="small" />
                   </Button>
                 </p>
               </div>
@@ -418,7 +415,7 @@ const PlatformWrapper = ({
                       {fetchCertificateError}
                     </span>
                   ) : (
-                    <Button variant="inverse" onClick={onDownloadFlagfile}>
+                    <Button variant="secondary" onClick={onDownloadFlagfile}>
                       Download
                       <Icon name="download" size="small" />
                     </Button>
diff --git a/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss b/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss
index baa763d113..4493a6b128 100644
--- a/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss
+++ b/frontend/components/AddHostsModal/PlatformWrapper/_styles.scss
@@ -30,9 +30,12 @@
     }
   }
 
+  &__advanced--fleet-certificate {
+    @include flex-column-8px-gap;
+  }
+
   &__certificate-loading {
     color: $ui-fleet-black-50;
-    padding-top: $pad-xsmall;
   }
 
   &__certificate-error {
diff --git a/frontend/components/AuthenticationNav/AuthenticationNav.tsx b/frontend/components/AuthenticationNav/AuthenticationNav.tsx
index 55c0c141af..6cc79a0ead 100644
--- a/frontend/components/AuthenticationNav/AuthenticationNav.tsx
+++ b/frontend/components/AuthenticationNav/AuthenticationNav.tsx
@@ -42,7 +42,7 @@ const AuthenticationNav = ({
       <Button
         onClick={onClick}
         className={`${baseClass}__back-link`}
-        variant="inverse"
+        variant="subdued"
       >
         <Icon name="close" color="core-fleet-black" />
       </Button>
diff --git a/frontend/components/BackButton/BackButton.tsx b/frontend/components/BackButton/BackButton.tsx
index 53db57ef63..39ec8159f2 100644
--- a/frontend/components/BackButton/BackButton.tsx
+++ b/frontend/components/BackButton/BackButton.tsx
@@ -28,7 +28,7 @@ const BackButton = ({
   };
 
   return (
-    <Button variant="inverse" onClick={onClick} className={classes}>
+    <Button variant="subdued" onClick={onClick} className={classes}>
       <Icon name="chevron-left" color="ui-fleet-black-50" />
       <span>{text}</span>
     </Button>
diff --git a/frontend/components/ConfirmDataCollectionDisableModal/ConfirmDataCollectionDisableModal.tsx b/frontend/components/ConfirmDataCollectionDisableModal/ConfirmDataCollectionDisableModal.tsx
index cd51f5ec19..01f5c4709e 100644
--- a/frontend/components/ConfirmDataCollectionDisableModal/ConfirmDataCollectionDisableModal.tsx
+++ b/frontend/components/ConfirmDataCollectionDisableModal/ConfirmDataCollectionDisableModal.tsx
@@ -56,7 +56,7 @@ const ConfirmDataCollectionDisableModal = ({
           <Button variant="alert" onClick={onConfirm} isLoading={isUpdating}>
             Save and disable
           </Button>
-          <Button variant="inverse-alert" onClick={onCancel}>
+          <Button variant="secondary" onClick={onCancel}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/components/Editor/Editor.tsx b/frontend/components/Editor/Editor.tsx
index 8ab4ffeddb..ec9b5232b7 100644
--- a/frontend/components/Editor/Editor.tsx
+++ b/frontend/components/Editor/Editor.tsx
@@ -91,7 +91,7 @@ const Editor = ({
   const renderCopyButton = () => {
     return (
       <div className={`${baseClass}__copy-wrapper`}>
-        <CopyButton copyText={value ?? ""} />
+        <CopyButton copyText={value ?? ""} variant="subdued" />
       </div>
     );
   };
diff --git a/frontend/components/EmptyState/EmptyState.stories.tsx b/frontend/components/EmptyState/EmptyState.stories.tsx
index 9995ca213a..50dbd00831 100644
--- a/frontend/components/EmptyState/EmptyState.stories.tsx
+++ b/frontend/components/EmptyState/EmptyState.stories.tsx
@@ -46,7 +46,7 @@ export const WithTwoButtons: Story = {
     header: "No policies",
     info: "Start monitoring compliance by creating your first policy.",
     primaryButton: <Button>Create policy</Button>,
-    secondaryButton: <Button variant="inverse">Import from library</Button>,
+    secondaryButton: <Button variant="secondary">Import from library</Button>,
   },
 };
 
diff --git a/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx b/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx
index e14da0c856..8cb02b6a2a 100644
--- a/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx
+++ b/frontend/components/EnrollSecrets/DeleteSecretModal/DeleteSecretModal.tsx
@@ -44,7 +44,7 @@ const DeleteSecretModal = ({
           >
             Delete
           </Button>
-          <Button onClick={toggleDeleteSecretModal} variant="inverse-alert">
+          <Button onClick={toggleDeleteSecretModal} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/components/EnrollSecrets/EnrollSecretModal/EnrollSecretModal.tsx b/frontend/components/EnrollSecrets/EnrollSecretModal/EnrollSecretModal.tsx
index a093df9935..3dd501b5e6 100644
--- a/frontend/components/EnrollSecrets/EnrollSecretModal/EnrollSecretModal.tsx
+++ b/frontend/components/EnrollSecrets/EnrollSecretModal/EnrollSecretModal.tsx
@@ -53,37 +53,17 @@ const EnrollSecretModal = ({
     >
       {teamInfo?.secrets?.length ? (
         <div className={`${baseClass} form`}>
-          <div className={`${baseClass}__header`}>
-            <div className={`${baseClass}__description`}>
-              Use these secret(s) to enroll hosts
-              {primoMode || teamInfo?.name === "Unassigned" ? (
-                ""
-              ) : (
-                <>
-                  {" "}
-                  to <b>{teamInfo?.name}</b>
-                </>
-              )}
-              .
-            </div>
-            <div className={`${baseClass}__add-secret`}>
-              <GitOpsModeTooltipWrapper
-                entityType="secrets"
-                position="right"
-                tipOffset={8}
-                renderChildren={(disableChildren) => (
-                  <Button
-                    disabled={disableChildren}
-                    onClick={addNewSecretClick}
-                    className={`${baseClass}__add-secret-btn`}
-                    variant="brand-inverse-icon"
-                    iconStroke
-                  >
-                    Add secret <Icon name="plus" color="core-fleet-green" />
-                  </Button>
-                )}
-              />
-            </div>
+          <div className={`${baseClass}__description`}>
+            Use these secret(s) to enroll hosts
+            {primoMode || teamInfo?.name === "Unassigned" ? (
+              ""
+            ) : (
+              <>
+                {" "}
+                to <b>{teamInfo?.name}</b>
+              </>
+            )}
+            .
           </div>
           <EnrollSecretTable
             secrets={teamInfo?.secrets}
@@ -120,10 +100,10 @@ const EnrollSecretModal = ({
                   disabled={disableChildren}
                   onClick={addNewSecretClick}
                   className={`${baseClass}__add-secret-btn`}
-                  variant="brand-inverse-icon"
-                  iconStroke
+                  variant="secondary"
                 >
-                  Add secret <Icon name="plus" color="core-fleet-green" />
+                  <Icon name="plus" />
+                  Add secret
                 </Button>
               )}
             />
@@ -131,7 +111,25 @@ const EnrollSecretModal = ({
         />
       )}
       <div className="modal-cta-wrap">
-        <Button onClick={onReturnToApp}>Close</Button>
+        <Button onClick={onReturnToApp}>Done</Button>
+        {!!teamInfo?.secrets?.length && (
+          <GitOpsModeTooltipWrapper
+            entityType="secrets"
+            position="right"
+            tipOffset={8}
+            renderChildren={(disableChildren) => (
+              <Button
+                disabled={disableChildren}
+                onClick={addNewSecretClick}
+                className={`${baseClass}__add-secret-btn`}
+                variant="secondary"
+              >
+                <Icon name="plus" />
+                Add secret
+              </Button>
+            )}
+          />
+        )}
       </div>
     </Modal>
   );
diff --git a/frontend/components/EnrollSecrets/EnrollSecretModal/_styles.scss b/frontend/components/EnrollSecrets/EnrollSecretModal/_styles.scss
index e4435860e4..8a29d29f63 100644
--- a/frontend/components/EnrollSecrets/EnrollSecretModal/_styles.scss
+++ b/frontend/components/EnrollSecrets/EnrollSecretModal/_styles.scss
@@ -8,12 +8,6 @@
     color: $ui-error;
   }
 
-  &__header {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-  }
-
   .empty-table__container {
     margin: $pad-large auto $pad-medium;
     gap: $pad-medium;
diff --git a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tsx b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tsx
index 6b3dde7ab2..5013115fd6 100644
--- a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tsx
+++ b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/EnrollSecretRow.tsx
@@ -50,8 +50,7 @@ const EnrollSecretRow = ({
             disabled={disableChildren}
             onClick={onEditSecretClick}
             className={`${baseClass}__edit-secret-icon`}
-            variant="icon"
-            size="small"
+            variant="secondary"
           >
             <Icon name="pencil" />
           </Button>
@@ -59,8 +58,7 @@ const EnrollSecretRow = ({
             onClick={onDeleteSecretClick}
             disabled={disableChildren}
             className={`${baseClass}__delete-secret-icon`}
-            variant="icon"
-            size="small"
+            variant="secondary"
           >
             <Icon name="trash" />
           </Button>
diff --git a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss
index edc8eb1b2f..a434cc233c 100644
--- a/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss
+++ b/frontend/components/EnrollSecrets/EnrollSecretTable/EnrollSecretRow/_styles.scss
@@ -2,8 +2,7 @@
   &__secret {
     display: flex;
     align-items: center;
-    // this is doubled to make an 8px space due to presence of width:0 relatively-positioned 2nd flex child
-    gap: 4px;
+    gap: $pad-small;
 
     .form-field {
       margin-bottom: 0;
@@ -21,10 +20,6 @@
 
   &__edit-delete-btns {
     display: flex;
-    gap: $pad-xsmall;
-
-    .button--icon__small {
-      @include bordered-icon-button;
-    }
+    gap: $pad-small;
   }
 }
diff --git a/frontend/components/FeedListItem/FeedListItem.tsx b/frontend/components/FeedListItem/FeedListItem.tsx
index 788253a10d..7d32a303aa 100644
--- a/frontend/components/FeedListItem/FeedListItem.tsx
+++ b/frontend/components/FeedListItem/FeedListItem.tsx
@@ -85,7 +85,7 @@ const FeedListItem = ({
           {allowShowDetails && (
             <Button
               className={`${baseClass}__action-button`}
-              variant="icon"
+              variant="subdued"
               onClick={onClickFeedItem}
               ariaLabel="show info"
             >
@@ -95,7 +95,7 @@ const FeedListItem = ({
           {allowCancel && (
             <Button
               className={`${baseClass}__action-button`}
-              variant="icon"
+              variant="subdued"
               onClick={onClickCancel}
               disabled={disableCancel}
               ariaLabel="cancel action"
diff --git a/frontend/components/FileDetails/FileDetails.tsx b/frontend/components/FileDetails/FileDetails.tsx
index 61a46f2c91..728d7f7531 100644
--- a/frontend/components/FileDetails/FileDetails.tsx
+++ b/frontend/components/FileDetails/FileDetails.tsx
@@ -80,11 +80,11 @@ const FileDetails = ({
         <Button
           disabled={disabled}
           className={`${baseClass}__edit-button`}
-          variant="icon"
+          variant="subdued"
           onClick={() => handleClickEdit(disabled)}
           title="Replace file"
         >
-          <Icon name="pencil" color="ui-fleet-black-75" />
+          <Icon name="pencil" />
         </Button>
         <input
           ref={inputRef}
@@ -135,7 +135,7 @@ const FileDetails = ({
         <div className={`${baseClass}__delete`}>
           <Button
             className={`${baseClass}__delete-button`}
-            variant="icon"
+            variant="subdued"
             onClick={onDeleteFile}
           >
             <label htmlFor="delete-file">
diff --git a/frontend/components/FileUploader/FileUploader.tsx b/frontend/components/FileUploader/FileUploader.tsx
index d21f83be93..c2ffe73884 100644
--- a/frontend/components/FileUploader/FileUploader.tsx
+++ b/frontend/components/FileUploader/FileUploader.tsx
@@ -54,7 +54,7 @@ interface IFileUploaderProps {
    * a link.
    * @default "button"
    */
-  buttonType?: "button" | "brand-inverse-icon";
+  buttonType?: "button" | "secondary";
   /** renders a tooltip for the button. If `gitopsCompatible` is set to `true`
    * this tooltip will not be rendered if gitops mode is enabled. */
   buttonTooltip?: React.ReactNode;
@@ -119,8 +119,7 @@ export const FileUploader = ({
     [`${baseClass}__file-preview`]: isFileSelected,
     [`${baseClass}__error`]: !!internalError,
   });
-  const buttonVariant =
-    buttonType === "button" ? "default" : "brand-inverse-icon";
+  const buttonVariant = buttonType === "button" ? "default" : "secondary";
 
   const triggerFileInput = () => {
     fileInputRef.current?.click();
@@ -168,9 +167,7 @@ export const FileUploader = ({
     let buttonMarkup = (
       <>
         {buttonMessage}
-        {buttonType === "brand-inverse-icon" && (
-          <Icon color="core-fleet-green" name="upload" />
-        )}
+        {buttonType === "secondary" && <Icon name="upload" />}
       </>
     );
     // If we want to actual do file uploading, wrap in a label that
diff --git a/frontend/components/InfoBanner/InfoBanner.tsx b/frontend/components/InfoBanner/InfoBanner.tsx
index 6ae8d7b2e1..a10855be45 100644
--- a/frontend/components/InfoBanner/InfoBanner.tsx
+++ b/frontend/components/InfoBanner/InfoBanner.tsx
@@ -66,11 +66,7 @@ const InfoBanner = ({
         <div className={`${baseClass}__cta`}>
           {cta}
           {closable && (
-            <Button
-              variant="icon"
-              onClick={() => setHideBanner(true)}
-              iconStroke
-            >
+            <Button variant="subdued" onClick={() => setHideBanner(true)}>
               <Icon
                 name="close"
                 color="core-fleet-black"
diff --git a/frontend/components/LiveQuery/SelectTargets.tsx b/frontend/components/LiveQuery/SelectTargets.tsx
index 39a7e3d78a..b307043a90 100644
--- a/frontend/components/LiveQuery/SelectTargets.tsx
+++ b/frontend/components/LiveQuery/SelectTargets.tsx
@@ -469,6 +469,7 @@ const SelectTargets = ({
               showText="Show more"
               hideText="Show less"
               isShowing={isListExpanded}
+              variant="secondary"
             />
           </div>
         )}
@@ -639,7 +640,7 @@ const SelectTargets = ({
         <Button
           className={`${baseClass}__btn`}
           onClick={handleClickCancel}
-          variant="inverse"
+          variant="secondary"
         >
           Cancel
         </Button>
diff --git a/frontend/components/Modal/Modal.tsx b/frontend/components/Modal/Modal.tsx
index 80470b144a..5035dc0e89 100644
--- a/frontend/components/Modal/Modal.tsx
+++ b/frontend/components/Modal/Modal.tsx
@@ -206,9 +206,8 @@ const Modal = ({
           {!disableClosingModal && (
             <div className={`${baseClass}__ex`}>
               <Button
-                variant="icon"
+                variant="subdued"
                 onClick={handleClose}
-                iconStroke
                 autofocus={isContentDisabled}
               >
                 <Icon name="close" color="core-fleet-black" size="medium" />
diff --git a/frontend/components/ModalFooter/ModalFooter.stories.tsx b/frontend/components/ModalFooter/ModalFooter.stories.tsx
index 1d765de671..b97af40558 100644
--- a/frontend/components/ModalFooter/ModalFooter.stories.tsx
+++ b/frontend/components/ModalFooter/ModalFooter.stories.tsx
@@ -36,10 +36,10 @@ export const Default: Story = {
     ),
     secondaryButtons: (
       <>
-        <Button variant="icon" onClick={() => alert("Download clicked")}>
+        <Button variant="secondary" onClick={() => alert("Download clicked")}>
           <Icon name="download" />
         </Button>
-        <Button variant="icon" onClick={() => alert("Delete clicked")}>
+        <Button variant="secondary" onClick={() => alert("Delete clicked")}>
           <Icon name="trash" color="ui-fleet-black-75" />
         </Button>
       </>
diff --git a/frontend/components/Pagination/Pagination.tsx b/frontend/components/Pagination/Pagination.tsx
index 6eefbf0e08..f366fa3e6a 100644
--- a/frontend/components/Pagination/Pagination.tsx
+++ b/frontend/components/Pagination/Pagination.tsx
@@ -35,7 +35,7 @@ const Pagination = ({
   return (
     <div className={classNames}>
       <Button
-        variant="inverse"
+        variant="subdued"
         disabled={disablePrev}
         onClick={onPrevPage}
         className={`${baseClass}__pagination-button`}
@@ -43,7 +43,7 @@ const Pagination = ({
         <Icon name="chevron-left" color="ui-fleet-black-75" /> Previous
       </Button>
       <Button
-        variant="inverse"
+        variant="subdued"
         disabled={disableNext}
         onClick={onNextPage}
         className={`${baseClass}__pagination-button`}
diff --git a/frontend/components/SQLEditor/SQLEditor.tsx b/frontend/components/SQLEditor/SQLEditor.tsx
index 60e271e141..a4e9bfd78e 100644
--- a/frontend/components/SQLEditor/SQLEditor.tsx
+++ b/frontend/components/SQLEditor/SQLEditor.tsx
@@ -285,7 +285,7 @@ const SQLEditor = ({
         <div className={`${baseClass}__label-actions`}>
           {labelActionComponent}
           {enableCopy && (
-            <CopyButton copyText={value || ""} variant="inverse" size="small">
+            <CopyButton copyText={value || ""} variant="subdued" size="small">
               Copy <Icon name="copy" />
             </CopyButton>
           )}
diff --git a/frontend/components/TableContainer/DataTable/ActionButton/ActionButton.tsx b/frontend/components/TableContainer/DataTable/ActionButton/ActionButton.tsx
index f5cf1f6af5..8750a87671 100644
--- a/frontend/components/TableContainer/DataTable/ActionButton/ActionButton.tsx
+++ b/frontend/components/TableContainer/DataTable/ActionButton/ActionButton.tsx
@@ -20,7 +20,6 @@ export interface IActionButtonProps {
   variant?: ButtonVariant;
   hideButton?: boolean | ((targetIds: number[]) => boolean);
   iconSvg?: IconNames;
-  iconStroke?: boolean;
   iconColor?: Colors;
   iconPosition?: string;
   isDisabled?: boolean;
@@ -47,7 +46,6 @@ const ActionButton = (buttonProps: IActionButtonProps): JSX.Element | null => {
     variant = "default",
     hideButton,
     iconSvg,
-    iconStroke = false,
     iconColor,
     iconPosition,
     isDisabled,
@@ -83,16 +81,15 @@ const ActionButton = (buttonProps: IActionButtonProps): JSX.Element | null => {
       <Button
         onClick={() => onButtonClick(targetIds)}
         variant={variant}
-        iconStroke={iconStroke}
         size="small"
       >
         <>
           {iconPosition === "left" && iconSvg && (
-            <Icon name={iconSvg} color={iconColor} />
+            <Icon name={iconSvg} color={iconColor} size="small" />
           )}
           {resolvedButtonText}
           {iconPosition !== "left" && iconSvg && (
-            <Icon name={iconSvg} color={iconColor} />
+            <Icon name={iconSvg} color={iconColor} size="small" />
           )}
         </>
       </Button>
diff --git a/frontend/components/TableContainer/DataTable/DataTable.tsx b/frontend/components/TableContainer/DataTable/DataTable.tsx
index ee1a221872..c9cf4b98d5 100644
--- a/frontend/components/TableContainer/DataTable/DataTable.tsx
+++ b/frontend/components/TableContainer/DataTable/DataTable.tsx
@@ -555,20 +555,11 @@ const DataTable = ({
             </div>
             {toggleAllPagesSelected && renderAreAllSelected()}
             {shouldRenderToggleAllPages && (
-              <Button
-                onClick={onToggleAllPagesClick}
-                variant="inverse"
-                className="light-text"
-                size="small"
-              >
+              <Button onClick={onToggleAllPagesClick} variant="link">
                 <>Select all matching {resultsTitle}</>
               </Button>
             )}
-            <Button
-              onClick={onClearSelectionClick}
-              variant="inverse"
-              size="small"
-            >
+            <Button onClick={onClearSelectionClick} variant="link">
               Clear selection
             </Button>
           </div>
diff --git a/frontend/components/TableContainer/DataTable/_styles.scss b/frontend/components/TableContainer/DataTable/_styles.scss
index d7220d5448..c65489b62b 100644
--- a/frontend/components/TableContainer/DataTable/_styles.scss
+++ b/frontend/components/TableContainer/DataTable/_styles.scss
@@ -25,7 +25,11 @@ $shadow-transition-width: 16px;
           $core-fleet-white,
           $core-fleet-white-transparent
         ),
-        linear-gradient(to left, $core-fleet-white, $core-fleet-white-transparent),
+        linear-gradient(
+          to left,
+          $core-fleet-white,
+          $core-fleet-white-transparent
+        ),
         /* Shadow covers */
           linear-gradient(
             to right,
diff --git a/frontend/components/TableContainer/TableContainer.tsx b/frontend/components/TableContainer/TableContainer.tsx
index 2442a13551..e27886f49c 100644
--- a/frontend/components/TableContainer/TableContainer.tsx
+++ b/frontend/components/TableContainer/TableContainer.tsx
@@ -373,11 +373,19 @@ const TableContainer = <T,>({
           className={`${baseClass}__table-action-button`}
         >
           <>
-            {resolvedButtonText}
-            {actionButton.iconSvg && (
+            {actionButton.iconPosition === "left" && actionButton.iconSvg && (
               <Icon
                 name={actionButton.iconSvg}
                 color={actionButton.iconColor || "ui-fleet-black-75"}
+                size="small"
+              />
+            )}
+            {resolvedButtonText}
+            {actionButton.iconPosition !== "left" && actionButton.iconSvg && (
+              <Icon
+                name={actionButton.iconSvg}
+                color={actionButton.iconColor || "ui-fleet-black-75"}
+                size="small"
               />
             )}
           </>
diff --git a/frontend/components/TableContainer/_styles.scss b/frontend/components/TableContainer/_styles.scss
index 0c34c6412c..5bf60ede64 100644
--- a/frontend/components/TableContainer/_styles.scss
+++ b/frontend/components/TableContainer/_styles.scss
@@ -120,6 +120,13 @@
     }
   }
 
+  // Compound selector (not just &__table-action-button) so this reliably
+  // beats the base .button class's own padding regardless of SCSS compile
+  // order — a tie at equal specificity bit us before (Scripts row gap).
+  &__table-action-button.button {
+    padding: $pad-small;
+  }
+
   &__header-left {
     display: flex;
     width: 100%;
@@ -254,6 +261,12 @@
       transition: 250ms;
       text-overflow: none;
 
+      // Reveal on the button's own keyboard focus, not just row hover/focus —
+      // otherwise tabbing directly to a hidden row-hover button never shows it.
+      &:focus-visible {
+        opacity: 1;
+      }
+
       // React-select's dropdown opacity must be controlled at input level for keyboard nav
       // So must be controlled at input level here as well
       &.actions-dropdown {
diff --git a/frontend/components/TargetsInput/TargetsInputHostsTableConfig.tsx b/frontend/components/TargetsInput/TargetsInputHostsTableConfig.tsx
index 3d1439bccb..4cc1a9afa8 100644
--- a/frontend/components/TargetsInput/TargetsInputHostsTableConfig.tsx
+++ b/frontend/components/TargetsInput/TargetsInputHostsTableConfig.tsx
@@ -28,7 +28,7 @@ export const generateTableHeaders = (
           Cell: (cellProps: ITableStringCellProps) => (
             <Button
               onClick={() => handleRowRemove(cellProps.row)}
-              variant="icon"
+              variant="subdued"
             >
               <Icon name="close-filled" />
             </Button>
diff --git a/frontend/components/ViewAllHostsLink/ViewAllHostsButton.tsx b/frontend/components/ViewAllHostsLink/ViewAllHostsButton.tsx
index ab42170de2..81717b08c8 100644
--- a/frontend/components/ViewAllHostsLink/ViewAllHostsButton.tsx
+++ b/frontend/components/ViewAllHostsLink/ViewAllHostsButton.tsx
@@ -62,7 +62,7 @@ const ViewAllHostsButton = ({
     <Button
       className={viewAllHostsButtonClass}
       onClick={onClick}
-      variant="inverse"
+      variant="subdued"
       size="small"
     >
       {!condensed && (
@@ -77,6 +77,7 @@ const ViewAllHostsButton = ({
           name="chevron-right"
           className={`${baseClass}__icon`}
           color="ui-fleet-black-75"
+          size="small"
         />
       )}
     </Button>
diff --git a/frontend/components/buttons/ActionButtons/ActionButtons.tsx b/frontend/components/buttons/ActionButtons/ActionButtons.tsx
index 6f8358957a..4584eddc85 100644
--- a/frontend/components/buttons/ActionButtons/ActionButtons.tsx
+++ b/frontend/components/buttons/ActionButtons/ActionButtons.tsx
@@ -56,52 +56,24 @@ const ActionButtons = ({ baseClass, actions }: IProps): JSX.Element => {
           className={`${baseClass}__action-buttons--secondary-buttons action-buttons__secondary-buttons`}
         >
           {secondaryActions.map((action) => {
-            if (!action.hideAction && action.buttonVariant !== "text-icon") {
-              if (action.gitOpsModeCompatible) {
-                return (
-                  <GitOpsModeTooltipWrapper
-                    renderChildren={(disableChildren) => (
-                      <Button
-                        variant={action.buttonVariant}
-                        onClick={action.onClick}
-                        disabled={disableChildren}
-                      >
-                        {action.label}
-                      </Button>
-                    )}
-                  />
-                );
-              }
-              return (
-                <Button variant={action.buttonVariant} onClick={action.onClick}>
-                  {action.label}
-                </Button>
-              );
-            }
             if (action.gitOpsModeCompatible) {
               return (
                 <GitOpsModeTooltipWrapper
                   renderChildren={(disableChildren) => (
                     <Button
-                      variant="inverse"
+                      variant={action.buttonVariant}
                       onClick={action.onClick}
                       disabled={disableChildren}
                     >
-                      <>
-                        {action.label}
-                        {action.iconName && <Icon name={action.iconName} />}
-                      </>
+                      {action.label}
                     </Button>
                   )}
                 />
               );
             }
             return (
-              <Button variant="inverse" onClick={action.onClick}>
-                <>
-                  {action.label}
-                  {action.iconName && <Icon name={action.iconName} />}
-                </>
+              <Button variant={action.buttonVariant} onClick={action.onClick}>
+                {action.label}
               </Button>
             );
           })}
@@ -112,7 +84,7 @@ const ActionButtons = ({ baseClass, actions }: IProps): JSX.Element => {
           <DropdownButton
             showCaret={false}
             options={secondaryActions}
-            variant="inverse"
+            variant="secondary"
           >
             More options <Icon name="more" />
           </DropdownButton>
diff --git a/frontend/components/buttons/AutomationsButton/AutomationsButton.tsx b/frontend/components/buttons/AutomationsButton/AutomationsButton.tsx
index d7b29390bf..819e30a605 100644
--- a/frontend/components/buttons/AutomationsButton/AutomationsButton.tsx
+++ b/frontend/components/buttons/AutomationsButton/AutomationsButton.tsx
@@ -2,7 +2,6 @@ import React from "react";
 import classnames from "classnames";
 
 import Button, { IButtonProps } from "components/buttons/Button";
-import Icon from "components/Icon";
 
 const baseClass = "automations-button";
 
@@ -24,10 +23,10 @@ const AutomationsButton = ({
       className={classNames}
       onClick={onClick}
       disabled={disabled}
-      variant="inverse"
+      variant="secondary"
       size={size}
     >
-      <Icon name="settings" /> Automations
+      Manage automations
     </Button>
   );
 };
diff --git a/frontend/components/buttons/Button/Button.stories.tsx b/frontend/components/buttons/Button/Button.stories.tsx
index 1725261b9d..9d659f465e 100644
--- a/frontend/components/buttons/Button/Button.stories.tsx
+++ b/frontend/components/buttons/Button/Button.stories.tsx
@@ -1,7 +1,7 @@
 import React from "react";
 import { Meta, StoryObj } from "@storybook/react";
 import Icon from "components/Icon";
-import { ButtonVariant } from "./Button";
+import { ButtonVariant, IButtonProps } from "./Button";
 import Button from ".";
 
 const DEFAULT_ARGS = {
@@ -32,11 +32,16 @@ export default meta;
 type Story = StoryObj<typeof Button>;
 
 // Base template for NON-loading variants (explicitly hides isLoading)
-const Template = (variant: ButtonVariant, children?: JSX.Element): Story => ({
+const Template = (
+  variant: ButtonVariant,
+  children?: JSX.Element,
+  extraArgs?: Partial<IButtonProps> // e.g. { size: "small" } or { disabled: true }
+): Story => ({
   args: {
     ...DEFAULT_ARGS,
     variant,
     children: children || DEFAULT_ARGS.children, // Fall back to default text
+    ...extraArgs,
   },
   argTypes: {
     isLoading: { control: false }, // Explicitly hide for these
@@ -64,25 +69,68 @@ const createLoadingVariant = (variant: ButtonVariant): Story => ({
 // Variants with loading state
 export const DefaultVariant = createLoadingVariant("default");
 export const AlertVariant = createLoadingVariant("alert");
-export const InverseVariant = Template("inverse");
-export const InverseAlertVariant = Template("inverse-alert");
 
-export const PillVariant = Template("pill");
-export const LinkVariant = Template("link");
-export const TextIconVariant = Template(
-  "text-icon",
+// Bordered secondary button — see #35329
+export const SecondaryVariant = Template("secondary");
+export const SecondaryIconAfterVariant = Template(
+  "secondary",
   <>
     Button text <Icon name="plus" size="small" />
   </>
 );
-export const BrandInverseIconVariant = Template(
-  "brand-inverse-icon",
+export const SecondaryIconBeforeVariant = Template(
+  "secondary",
   <>
     <Icon name="plus" size="small" />
     Button text
   </>
 );
-export const IconVariant = Template("text-icon", <Icon name="trash" />);
+export const SecondaryIconOnlyVariant = Template(
+  "secondary",
+  <Icon name="trash" />
+);
+export const SecondarySmallVariant = Template("secondary", undefined, {
+  size: "small",
+});
+export const SecondaryDisabledVariant = Template("secondary", undefined, {
+  disabled: true,
+});
+
+// Borderless subdued button (low-emphasis text + icon)
+export const SubduedIconAfterVariant = Template(
+  "subdued",
+  <>
+    Button text <Icon name="chevron-right" size="small" />
+  </>
+);
+export const SubduedIconBeforeVariant = Template(
+  "subdued",
+  <>
+    <Icon name="chevron-left" size="small" />
+    Button text
+  </>
+);
+export const SubduedIconOnlyVariant = Template(
+  "subdued",
+  <Icon name="chevron-right" />
+);
+export const SubduedSmallVariant = Template(
+  "subdued",
+  <>
+    Button text <Icon name="chevron-right" size="small" />
+  </>,
+  { size: "small" }
+);
+export const SubduedDisabledVariant = Template(
+  "subdued",
+  <>
+    Button text <Icon name="chevron-right" size="small" />
+  </>,
+  { disabled: true }
+);
+
+export const PillVariant = Template("pill");
+export const LinkVariant = Template("link");
 
 export const UnstyledVariant = Template("unstyled");
 export const UnstyledModalQueryVariant = Template("unstyled-modal-query");
diff --git a/frontend/components/buttons/Button/Button.tests.tsx b/frontend/components/buttons/Button/Button.tests.tsx
index ca733165fc..d65d781f37 100644
--- a/frontend/components/buttons/Button/Button.tests.tsx
+++ b/frontend/components/buttons/Button/Button.tests.tsx
@@ -1,5 +1,6 @@
 import React from "react";
 import { render, fireEvent, screen } from "@testing-library/react";
+import Icon from "components/Icon";
 import Button from "./Button";
 
 describe("Button component", () => {
@@ -50,4 +51,38 @@ describe("Button component", () => {
     render(<Button title="Button title">Titled button</Button>);
     expect(screen.getByTitle("Button title")).toBeInTheDocument();
   });
+  it("applies the bordered secondary variant class", () => {
+    const { container } = render(
+      <Button variant="secondary">Secondary</Button>
+    );
+    expect(container.firstChild).toHaveClass("button button--secondary");
+  });
+  it("applies the subdued variant class", () => {
+    const { container } = render(<Button variant="subdued">Subdued</Button>);
+    expect(container.firstChild).toHaveClass("button button--subdued");
+  });
+  it("applies the small modifier for a small secondary button", () => {
+    const { container } = render(
+      <Button variant="secondary" size="small">
+        Secondary
+      </Button>
+    );
+    expect(container.firstChild).toHaveClass("button--secondary__small");
+  });
+  it("adds the icon-only class when a secondary button has only an icon", () => {
+    const { container } = render(
+      <Button variant="secondary">
+        <Icon name="trash" />
+      </Button>
+    );
+    expect(container.firstChild).toHaveClass("button--icon-only");
+  });
+  it("does not add the icon-only class when a secondary button has a text label", () => {
+    const { container } = render(
+      <Button variant="secondary">
+        Delete <Icon name="trash" />
+      </Button>
+    );
+    expect(container.firstChild).not.toHaveClass("button--icon-only");
+  });
 });
diff --git a/frontend/components/buttons/Button/Button.tsx b/frontend/components/buttons/Button/Button.tsx
index 8e6e197a87..72f7e7ecb7 100644
--- a/frontend/components/buttons/Button/Button.tsx
+++ b/frontend/components/buttons/Button/Button.tsx
@@ -1,6 +1,7 @@
 import React from "react";
 import classnames from "classnames";
 import Spinner from "components/Spinner";
+import Icon from "components/Icon";
 
 const baseClass = "button";
 
@@ -10,11 +11,8 @@ export type ButtonVariant =
   | "pill"
   | "grey-pill"
   | "link" // Looks like CustomLink with animated underline on hover
-  | "brand-inverse-icon" // Green icon with text, no underline on hover
-  | "text-icon" // DEPRECATED — use "inverse" instead. Swept in the 2025-09 UI reskin (#33558); kept for legacy callers only. New code: always reach for "inverse".
-  | "icon" // Buttons without text
-  | "inverse" // Preferred secondary button. Use this anywhere you'd reflexively reach for "text-icon".
-  | "inverse-alert"
+  | "secondary" // Bordered secondary button (off-white fill + border). The new preferred secondary — see #35329.
+  | "subdued" // Low-emphasis borderless text + icon button. Not to be confused with a link.
   | "unstyled" // Avoid as much as possible (used in registration breadcrumbs, 404/500, an old button dropdown)
   | "unstyled-modal-query"
   | "oversized";
@@ -39,8 +37,6 @@ export interface IButtonProps {
       ) => void);
   isLoading?: boolean;
   customOnKeyDown?: (e: React.KeyboardEvent) => void;
-  /** Required for buttons that contain SVG icons using`stroke` instead of`fill` for proper hover styling */
-  iconStroke?: boolean;
   ariaHasPopup?:
     | boolean
     | "false"
@@ -52,6 +48,7 @@ export interface IButtonProps {
     | "dialog";
   ariaExpanded?: boolean;
   ariaLabel?: string;
+  ariaPressed?: boolean;
   /** Small: 1/2 the padding, Wide: 200px */
   size?: "small" | "wide" | "default";
 }
@@ -124,12 +121,22 @@ class Button extends React.Component<IButtonProps, IButtonState> {
       variant,
       isLoading,
       customOnKeyDown,
-      iconStroke,
       ariaHasPopup,
       ariaExpanded,
       ariaLabel,
+      ariaPressed,
       size,
     } = this.props;
+    // The bordered "secondary" and borderless "subdued" variants render as a
+    // square when their only content is an icon (no text label) — see #35329.
+    // toArray strips false/null and flattens fragments, so we reliably detect a
+    // lone <Icon> child while ignoring conditional or wrapped text content.
+    const childArray = React.Children.toArray(children);
+    const isIconOnly =
+      (variant === "secondary" || variant === "subdued") &&
+      childArray.length === 1 &&
+      React.isValidElement(childArray[0]) &&
+      childArray[0].type === Icon;
     const fullClassName = classnames(
       baseClass,
       `${baseClass}--${variant}`,
@@ -138,14 +145,13 @@ class Button extends React.Component<IButtonProps, IButtonState> {
         [`${baseClass}--${variant}__small`]: size === "small",
         [`${baseClass}__wide`]: size === "wide",
         [`${baseClass}--disabled`]: disabled,
-        [`${baseClass}--icon-stroke`]: iconStroke,
+        [`${baseClass}--icon-only`]: isIconOnly,
       }
     );
     const onWhite =
       variant === "link" ||
-      variant === "inverse" ||
-      variant === "brand-inverse-icon" ||
-      variant === "text-icon" ||
+      variant === "secondary" ||
+      variant === "subdued" ||
       variant === "pill" ||
       variant === "grey-pill";
 
@@ -162,6 +168,7 @@ class Button extends React.Component<IButtonProps, IButtonState> {
         aria-haspopup={ariaHasPopup}
         aria-expanded={ariaExpanded}
         aria-label={ariaLabel}
+        aria-pressed={ariaPressed}
       >
         <div className={isLoading ? "transparent-text" : "children-wrapper"}>
           {children}
diff --git a/frontend/components/buttons/Button/_styles.scss b/frontend/components/buttons/Button/_styles.scss
index f035313b65..2f3b06292f 100644
--- a/frontend/components/buttons/Button/_styles.scss
+++ b/frontend/components/buttons/Button/_styles.scss
@@ -252,181 +252,38 @@ $base-class: "button";
     }
   }
 
-  // &--icon is used for svg icon buttons without text
-  &--text-icon,
-  &--icon {
-    @include button-variant(
-      $core-fleet-white,
-      $core-fleet-green-over,
-      $core-fleet-green-down,
-      $inverse: true
-    );
-    background-color: transparent;
-    padding: 0;
-    border: 0;
-    box-shadow: none;
+  // Bordered secondary button (off-white fill + gray border). The new preferred
+  // secondary — see #35329. Options: default, icon before/after, icon only.
+  &--secondary {
+    @include button-variant($ui-off-white, null, null, $inverse: true);
+    @include button-pad-8px-16px; // full-size padding (override the $inverse 8/8)
     color: $ui-fleet-black-75;
-    font-size: $x-small;
-    font-weight: $bold;
-    cursor: pointer;
-
-    img {
-      transform: scale(0.5);
-    }
-
-    &:focus {
-      outline: none;
-    }
-
-    &:focus-visible {
-      @include button-focus-outline();
-    }
-
-    &:hover,
-    &:focus {
-      color: $ui-fleet-black-75-over;
-      background-color: $ui-fleet-black-5;
-
-      svg {
-        path {
-          fill: $ui-fleet-black-75-over;
-        }
-      }
-
-      &:active {
-        color: $ui-fleet-black-75-down;
-        background-color: $ui-fleet-black-5-down;
-
-        svg {
-          path {
-            fill: $ui-fleet-black-75-down;
-          }
-        }
-      }
-
-      // If .button--icon-stroke is present, use stroke instead of fill
-      // Some SVG icons in these buttons contain a `stroke` instead of a `fill`,
-      // so we need to modify that property instead. Adding a custom `fill`
-      // could make these icons render incorrectly.
-      &.button--icon-stroke {
-        &:hover,
-        &:focus {
-          svg {
-            path {
-              fill: none; // Prevent fill from interfering
-              stroke: $ui-fleet-black-75-over;
-            }
-          }
-          &:active {
-            svg {
-              path {
-                stroke: $ui-fleet-black-75-down;
-              }
-            }
-          }
-        }
-      }
-    }
-
-    // globally styled gap between text and icon
-    .children-wrapper {
-      gap: $pad-small;
-    }
-  }
-
-  // Used for primary buttons with green icon and green text, no underline on hover
-  &--brand-inverse-icon {
-    @include button-variant(transparent);
-    @include button-pad-8px-8px;
-    border: 0;
-    box-shadow: none;
-    color: $core-fleet-green;
-    font-size: $x-small;
-    font-weight: $bold;
-    cursor: pointer;
+    border: 1px solid $ui-fleet-black-25;
+    box-sizing: border-box;
 
     &__small {
       @include button-pad-4px-8px;
     }
 
-    img {
-      transform: scale(0.5);
-    }
-
-    &:focus {
-      outline: none;
-    }
-
-    &:focus-visible {
-      @include button-focus-outline();
-    }
-
-    &:hover,
-    &:focus {
-      background-color: $core-fleet-black-overlay-05;
-      color: $core-fleet-green-over;
-
-      svg {
-        path {
-          fill: $core-fleet-green-over;
-        }
-      }
+    &:hover:not(.button--disabled) {
+      background-color: $ui-fleet-black-5;
 
       &:active {
-        color: $core-fleet-green-down;
-
-        svg {
-          path {
-            fill: $core-fleet-green-down;
-          }
-        }
-      }
-    }
-    // If .button--icon-stroke is present, use stroke instead of fill
-    // Some SVG icons in these buttons contain a `stroke` instead of a `fill`,
-    // so we need to modify that property instead. Adding a custom `fill`
-    // could make these icons render incorrectly.
-    &.button--icon-stroke {
-      &:hover,
-      &:focus {
-        svg {
-          path {
-            fill: none; // Prevent fill from interfering
-            stroke: $core-fleet-green-over;
-          }
-        }
-        &:active {
-          svg {
-            path {
-              stroke: $core-fleet-green-over;
-            }
-          }
-        }
+        background-color: $ui-fleet-black-10;
       }
     }
 
-    // globally styled gap between text and icon
+    // Spacing between an icon and the label (icon before/after)
     .children-wrapper {
       gap: $pad-small;
     }
   }
 
-  &--icon {
-    @include button-variant(
-      $core-fleet-white,
-      $core-fleet-green-over,
-      $core-fleet-green-down,
-      $inverse: true
-    );
-    background-color: transparent;
-    width: 36px; // Matches Figma design for icon-only buttons
-
-    &__small {
-      width: 28px; // Matches Figma design for small icon-only buttons
-    }
-  }
-
-  &--inverse {
+  // Low-emphasis borderless text + icon button. Not to be confused with a link.
+  // Options: icon before/after, icon only. Transparent fill, light-gray hover,
+  // and deliberately does NOT recolor the SVG on hover, so it works with both
+  // fill- and stroke-based icons (e.g. chevrons) without artifacts — see #35329.
+  &--subdued {
     @include button-variant(
       $core-fleet-white,
       $core-fleet-green-over,
@@ -437,20 +294,23 @@ $base-class: "button";
     color: $ui-fleet-black-75;
     box-sizing: border-box;
 
+    // Spacing between an icon and the label (icon before/after)
     .children-wrapper {
-      gap: $pad-small; // For icons next to text like Pagination buttons
+      gap: $pad-small;
     }
   }
 
-  &--inverse-alert {
-    @include button-variant(
-      $core-fleet-white,
-      $core-vibrant-red-over,
-      $core-vibrant-red-down,
-      $inverse: true
-    );
-    color: $core-vibrant-red;
-    box-sizing: border-box;
+  // Icon-only secondary/subdued buttons render as a square so a lone icon is
+  // centered (mirrors &--icon). The isIconOnly flag in Button.tsx adds this class.
+  &--secondary.button--icon-only,
+  &--subdued.button--icon-only {
+    width: 36px;
+    padding: 0;
+  }
+
+  &--secondary__small.button--icon-only,
+  &--subdued__small.button--icon-only {
+    width: 28px;
   }
 
   &--disabled {
diff --git a/frontend/components/buttons/CopyButton/CopyButton.stories.tsx b/frontend/components/buttons/CopyButton/CopyButton.stories.tsx
index 227fe59fbc..0dba79145b 100644
--- a/frontend/components/buttons/CopyButton/CopyButton.stories.tsx
+++ b/frontend/components/buttons/CopyButton/CopyButton.stories.tsx
@@ -28,8 +28,8 @@ const inlineRow: React.CSSProperties = {
   fontSize: 14,
 };
 
-export const IconVariant: Story = {
-  args: { ...DEFAULT_ARGS, variant: "icon" },
+export const SubduedVariant: Story = {
+  args: { ...DEFAULT_ARGS, variant: "subdued" },
   render: (args) => (
     <span style={inlineRow}>
       <span>fleet-maintained-app-slug</span>
@@ -48,8 +48,8 @@ export const CompactVariant: Story = {
   ),
 };
 
-export const InverseVariant: Story = {
-  args: { ...DEFAULT_ARGS, variant: "inverse" },
+export const SecondaryVariant: Story = {
+  args: { ...DEFAULT_ARGS, variant: "secondary" },
   render: (args) => (
     <span style={inlineRow}>
       <code>SELECT * FROM users;</code>
diff --git a/frontend/components/buttons/CopyButton/CopyButton.tsx b/frontend/components/buttons/CopyButton/CopyButton.tsx
index 6600a63347..d345a0e268 100644
--- a/frontend/components/buttons/CopyButton/CopyButton.tsx
+++ b/frontend/components/buttons/CopyButton/CopyButton.tsx
@@ -7,14 +7,16 @@ import Button from "components/buttons/Button";
 import Icon from "components/Icon";
 import { stringToClipboard } from "utilities/copy_text";
 
-type CopyButtonVariant = "icon" | "inverse" | "compact";
+type CopyButtonVariant = "secondary" | "subdued" | "compact";
 
 interface ICopyButtonProps {
   copyText: string;
   /** Override the button's content. Defaults to `<Icon name="copy" />`. */
   children?: React.ReactNode;
-  /** `"icon"` (default) — standard 36×36 icon button.
-   *  `"inverse"` — bordered icon-with-text button (use with children).
+  /** `"subdued"` (default) — borderless low-emphasis icon-only button —
+   *  see #35329.
+   *  `"secondary"` — bordered 36×36 icon-only button (the current preferred
+   *  secondary style — see #35329).
    *  `"compact"` — icon collapsed to its natural size, no extra vertical
    *  chrome. Use for inline-with-text copy actions so the surrounding row
    *  doesn't grow to button height. */
@@ -26,6 +28,8 @@ interface ICopyButtonProps {
    *  for inline-with-text copy actions. Pass `10` to match react-tooltip 5's
    *  own default when the trigger is a larger floating button. */
   tooltipOffset?: number;
+  /** Table buttons show on row hover and tab focus only */
+  rowHover?: boolean;
 }
 
 const baseClass = "copy-button";
@@ -36,11 +40,12 @@ const ERROR_MESSAGE = "Copy failed";
 const CopyButton = ({
   copyText,
   children,
-  variant = "icon",
+  variant = "subdued",
   size,
   className,
   ariaLabel = "Copy to clipboard",
   tooltipOffset = 4,
+  rowHover = false,
 }: ICopyButtonProps) => {
   const [message, setMessage] = useState<string | null>(null);
   const tipIdRef = useRef(uniqueId("copy-button-tooltip-"));
@@ -56,10 +61,9 @@ const CopyButton = ({
 
   const onClick = (evt: React.MouseEvent<HTMLButtonElement>) => {
     evt.preventDefault();
-    // Fleet Button's --icon variant uses :focus (not :focus-visible) for its
-    // hover-background, so a mouse click leaves the button visually "stuck"
-    // highlighted. Drop focus only for mouse activations — keyboard Enter/
-    // Space report `detail === 0` and must keep their tab position.
+    // Drop focus only for mouse activations, so a lingering focus ring
+    // doesn't stay visible after a click — keyboard Enter/Space report
+    // `detail === 0` and must keep their tab position.
     if (evt.detail !== 0) {
       evt.currentTarget.blur();
     }
@@ -92,18 +96,22 @@ const CopyButton = ({
   return (
     <span className={baseClass} data-tooltip-id={tipIdRef.current}>
       <Button
-        variant={isCompact ? "icon" : variant}
+        variant={isCompact ? "subdued" : variant}
         size={size}
-        iconStroke
         onClick={onClick}
         className={classnames(
           `${baseClass}__button`,
-          { [`${baseClass}__button--compact`]: isCompact },
+          {
+            [`${baseClass}__button--compact`]: isCompact,
+            "row-hover-button": rowHover,
+          },
           className
         )}
         ariaLabel={ariaLabel}
       >
-        {children ?? <Icon name="copy" />}
+        {children ?? (
+          <Icon name="copy" size={size === "small" ? "small" : undefined} />
+        )}
       </Button>
       <ReactTooltip5
         id={tipIdRef.current}
diff --git a/frontend/components/buttons/DropdownButton/DropdownButton.stories.tsx b/frontend/components/buttons/DropdownButton/DropdownButton.stories.tsx
index 2cc3f7bdc5..5d789dda2f 100644
--- a/frontend/components/buttons/DropdownButton/DropdownButton.stories.tsx
+++ b/frontend/components/buttons/DropdownButton/DropdownButton.stories.tsx
@@ -34,10 +34,6 @@ const meta: Meta<typeof DropdownButton> = {
         "alert",
         "pill",
         "link",
-        "text-icon",
-        "icon",
-        "inverse",
-        "inverse-alert",
         "unstyled",
         "unstyled-modal-query",
       ],
diff --git a/frontend/components/buttons/RevealButton/RevealButton.tsx b/frontend/components/buttons/RevealButton/RevealButton.tsx
index f7a68f3a9a..948491cb9c 100644
--- a/frontend/components/buttons/RevealButton/RevealButton.tsx
+++ b/frontend/components/buttons/RevealButton/RevealButton.tsx
@@ -15,6 +15,8 @@ export interface IRevealButtonProps {
   tooltipContent?: React.ReactNode;
   disabledTooltipContent?: React.ReactNode;
   onClick?: (evt: React.MouseEvent<HTMLButtonElement>) => void;
+  /** Default: "secondary" */
+  variant?: "secondary" | "subdued";
 }
 
 const baseClass = "reveal-button";
@@ -30,6 +32,7 @@ const RevealButton = ({
   tooltipContent,
   disabledTooltipContent,
   onClick,
+  variant = "secondary",
 }: IRevealButtonProps): JSX.Element => {
   const classNames = classnames(baseClass, className);
 
@@ -67,12 +70,11 @@ const RevealButton = ({
 
   const button = (
     <Button
-      variant="inverse"
+      variant={variant}
       className={classNames}
       onClick={onClick}
       autofocus={autofocus}
       disabled={disabled}
-      iconStroke
     >
       {buttonContent()}
     </Button>
diff --git a/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx b/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx
index aaaf767043..2c6b731dc2 100644
--- a/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx
+++ b/frontend/components/forms/ChangeEmailForm/ChangeEmailForm.jsx
@@ -32,7 +32,7 @@ class ChangeEmailForm extends Component {
         />
         <div className="modal-cta-wrap">
           <Button type="submit">Submit</Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx
index de331b921a..3fe4799006 100644
--- a/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx
+++ b/frontend/components/forms/ChangePasswordForm/ChangePasswordForm.jsx
@@ -52,7 +52,7 @@ class ChangePasswordForm extends Component {
         />
         <div className="modal-cta-wrap">
           <Button type="submit">Change password</Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/components/forms/LoginForm/LoginForm.tsx b/frontend/components/forms/LoginForm/LoginForm.tsx
index 120810a580..b911d13e4c 100644
--- a/frontend/components/forms/LoginForm/LoginForm.tsx
+++ b/frontend/components/forms/LoginForm/LoginForm.tsx
@@ -88,7 +88,7 @@ const LoginForm = ({
       <Button
         className={`${baseClass}__sso-btn`}
         type="button"
-        variant="inverse"
+        variant="secondary"
         onClick={handleSSOSignOn}
         tabIndex={0}
       >
@@ -134,7 +134,7 @@ const LoginForm = ({
         <>
           <Button
             onClick={() => setShowPendingEmail(false)}
-            variant="inverse"
+            variant="subdued"
             className="back-link"
           >
             <Icon name="chevron-left" color="ui-fleet-black-75" />
diff --git a/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx b/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx
index 59bf63df94..1e17abd8e2 100644
--- a/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx
+++ b/frontend/components/forms/UserSettingsForm/UserSettingsForm.jsx
@@ -78,7 +78,7 @@ class UserSettingsForm extends Component {
         />
         <InputField {...fields.position} label="Position" />
         <div className="button-wrap">
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
           <Button type="submit">Update</Button>
diff --git a/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tests.tsx b/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tests.tsx
index 3e39dd9d6b..2715876f8b 100644
--- a/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tests.tsx
+++ b/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tests.tsx
@@ -99,64 +99,4 @@ describe("DropdownWrapper Component", () => {
 
     expect(screen.getByText(/no results found/i)).toBeInTheDocument();
   });
-
-  test("doesn't render selected value when variant is button", async () => {
-    const buttonText = "Click me";
-    render(
-      <DropdownWrapper
-        options={sampleOptions}
-        value="option1"
-        onChange={mockOnChange}
-        name="test-dropdown"
-        label="Test Dropdown"
-        placeholder={buttonText}
-        variant="button"
-      />
-    );
-
-    // Check if the button text is rendered
-    expect(screen.getByText(buttonText)).toBeInTheDocument();
-
-    // Open the dropdown
-    await userEvent.click(screen.getByText(buttonText));
-
-    // Select Option 2
-    await userEvent.click(screen.getByText(/option 2/i));
-
-    // Check if the button text is still rendered and not replaced by the selected option
-    expect(screen.getByText(buttonText)).toBeInTheDocument();
-    expect(screen.queryByText(/option 2/i)).not.toBeInTheDocument();
-  });
-
-  // Regression test for #45853 — react-select tracks the last click as
-  // selectValue and re-focuses it on reopen, leaving the previously-clicked
-  // option visually highlighted. Button variant overrides this by forcing
-  // value to null.
-  test("button variant does not mark a previously-clicked option as selected on reopen", async () => {
-    const buttonText = "Actions";
-    render(
-      <DropdownWrapper
-        options={sampleOptions}
-        onChange={mockOnChange}
-        name="test-dropdown"
-        placeholder={buttonText}
-        variant="button"
-      />
-    );
-
-    // Open, click Option 2, then reopen
-    await userEvent.click(screen.getByText(buttonText));
-    await userEvent.click(screen.getByText(/option 2/i));
-    await userEvent.click(screen.getByText(buttonText));
-
-    // On reopen, no menu option should carry the selected state.
-    // react-select adds `--is-selected` to the option matching `value`; the
-    // fix forces value to null for button variant so this class never appears.
-    const options = document.querySelectorAll(".react-select__option");
-    expect(options.length).toBeGreaterThan(0);
-
-    options.forEach((option) =>
-      expect(option.className).not.toMatch(/--is-selected/)
-    );
-  });
 });
diff --git a/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx b/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx
index 7fa7035ce6..18391aeea9 100644
--- a/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx
+++ b/frontend/components/forms/fields/DropdownWrapper/DropdownWrapper.tsx
@@ -99,7 +99,7 @@ export interface CustomOptionType {
   iconName?: IconNames;
 }
 
-type DropdownWrapperVariant = "table-filter" | "button";
+type DropdownWrapperVariant = "table-filter";
 
 export interface IDropdownWrapper {
   options: CustomOptionType[];
@@ -118,8 +118,7 @@ export interface IDropdownWrapper {
   placeholder?: string;
   /** E.g. scroll to view dropdown menu in a scrollable parent container */
   onMenuOpen?: () => void;
-  /** Table filter dropdowns have filter icon and height: 40px
-   *  Button dropdowns have hover/active state, padding, height matching actual buttons, and no selected option styling */
+  /** Table filter dropdowns have filter icon and height: 40px */
   variant?: DropdownWrapperVariant;
   /** This makes the menu fit all text without wrapping,
    * aligning right to fit text on screen */
@@ -141,19 +140,6 @@ const getOptionBackgroundColor = (
   return "transparent";
 };
 
-const getOptionFontWeight = (
-  state: OptionProps<CustomOptionType, false>,
-  variant?: DropdownWrapperVariant
-) => {
-  // For "button" dropdowns, selected options are not styled differently
-  if (variant === "button") {
-    return "normal";
-  }
-
-  // For other variants, selected options are bold
-  return state.isSelected ? "600" : "normal";
-};
-
 /** generates the default custom styles for the dropdown component.
  * NOTE: we export this from DropdownWrapper components so that other more
  * customisable dropdown components can use this for consistency in styling */
@@ -165,76 +151,20 @@ export const generateCustomDropdownStyles = (
 ): StylesConfig<CustomOptionType, false> => {
   return {
     container: (provided) => {
-      const buttonVariantContainer = {
-        borderRadius: "6px",
-        "&:active": {
-          backgroundColor: COLORS["ui-fleet-black-5"],
-        },
-        height: "38px",
-      };
-
       return {
         ...provided,
         width: "100%",
         height: "36px",
-        ...(variant === "button" && buttonVariantContainer),
       };
     },
 
     control: (provided, state) => {
-      if (variant === "button") {
-        return {
-          backgroundColor: "initial",
-          borderColor: "none",
-          display: "flex",
-          flexDirection: "row",
-          width: "max-content",
-          padding: PADDING["pad-small"],
-          border: 0,
-          borderRadius: "6px",
-          boxShadow: "none",
-          cursor: "pointer",
-          ".dropdown-wrapper__indicator path": {
-            stroke: COLORS["ui-fleet-black-75"],
-          },
-          "&:hover": {
-            backgroundColor: COLORS["ui-fleet-black-5"],
-            boxShadow: "none",
-            ".dropdown-wrapper__placeholder": {
-              color: COLORS["ui-fleet-black-75-over"],
-            },
-            ".dropdown-wrapper__indicator path": {
-              stroke: COLORS["ui-fleet-black-75-over"],
-            },
-          },
-          // Note: state.isFocused is intentionally not used as a highlight
-          // trigger here. react-select's internal input retains focus after
-          // the menu closes (outside click, post-modal-close, etc.), so
-          // styling on it would leave the trigger visually highlighted
-          // indefinitely (#45853). Hover + menuIsOpen cover the meaningful
-          // interactive states for an action button.
-          ...(state.menuIsOpen && {
-            backgroundColor: COLORS["ui-fleet-black-5"],
-            ".dropdown-wrapper__placeholder": {
-              color: COLORS["ui-fleet-black-75-down"],
-            },
-            ".dropdown-wrapper__indicator path": {
-              stroke: COLORS["ui-fleet-black-75-down"],
-            },
-            ".dropdown-wrapper__indicator svg": {
-              transform: "rotate(180deg)",
-              transition: "transform 0.25s ease",
-            },
-          }),
-          ...(variant === "button" && { height: "22px" }),
-        };
-      }
-
       return {
         ...provided,
         display: "flex",
         flexDirection: "row",
         width: "100%",
+        minHeight: "36px", // react-select-5 defaults control minHeight to 38px
         backgroundColor: COLORS["core-fleet-white"],
         paddingLeft: "8px", // TODO: Update to match styleguide of (16px) when updating rest of UI (8px)
         paddingRight: "8px",
@@ -308,23 +238,10 @@ export const generateCustomDropdownStyles = (
         }),
       };
     },
-    placeholder: (provided, state) => {
-      const buttonVariantPlaceholder = {
-        color: state.isFocused
-          ? COLORS["ui-fleet-black-75-over"]
-          : COLORS["ui-fleet-black-75"],
-        fontSize: "13px",
-        fontWeight: "600",
-        lineHeight: "normal",
-        paddingLeft: 0,
-        opacity: isDisabled ? 0.5 : 1,
-        marginTop: variant === "button" ? "-1px" : "1px", // TODO: Figure out vertical centering to not need pixel fix
-      };
-
+    placeholder: (provided) => {
       return {
         ...provided,
         fontSize: "13px",
-        ...(variant === "button" && buttonVariantPlaceholder),
       };
     },
     input: (provided) => {
@@ -383,7 +300,7 @@ export const generateCustomDropdownStyles = (
       ...provided,
       padding: 0,
       display: "flex",
-      gap: PADDING[variant === "button" ? "pad-xsmall" : "pad-small"],
+      gap: PADDING["pad-small"],
       flexWrap: "nowrap", // This ensures the value is on a single line and truncated
     }),
     option: (provided, state) => ({
@@ -392,7 +309,7 @@ export const generateCustomDropdownStyles = (
       fontSize: "13px",
       borderRadius: "4px",
       backgroundColor: getOptionBackgroundColor(state),
-      fontWeight: getOptionFontWeight(state, variant),
+      fontWeight: state.isSelected ? "600" : "normal",
       color: COLORS["core-fleet-black"],
       "&:hover": {
         backgroundColor: state.isDisabled
@@ -462,7 +379,6 @@ const DropdownWrapper = ({
 }: IDropdownWrapper) => {
   const wrapperClassNames = classnames(baseClass, className, {
     [`${baseClass}__table-filter`]: variant === "table-filter",
-    [`${baseClass}__button`]: variant === "button",
     [`${wrapperClassname}`]: !!wrapperClassname,
   });
 
@@ -481,13 +397,6 @@ const DropdownWrapper = ({
 
   // Ability to handle value of type string or CustomOptionType
   const getCurrentValue = () => {
-    // Button variant is a fire-and-forget action menu (selection isn't displayed
-    // via `controlShouldRenderValue`). Forcing null prevents react-select from
-    // tracking the last click as the selected value and re-focusing it on reopen
-    // (#45853).
-    if (variant === "button") {
-      return null;
-    }
     if (typeof value === "string") {
       return options.find((option) => option.value === value) || null;
     }
@@ -565,7 +474,6 @@ const DropdownWrapper = ({
         tabIndex={isDisabled ? -1 : 0} // Ensures disabled dropdown has no keyboard accessibility
         placeholder={placeholder}
         onMenuOpen={onMenuOpen}
-        controlShouldRenderValue={variant !== "button"} // Control doesn't change placeholder to selected value
         // Resolve accessible name: explicit prop wins, otherwise fall back
         // to the placeholder (usually "Select X"), otherwise the required
         // `name` (often a kebab-case identifier — least readable but
diff --git a/frontend/components/forms/fields/DropdownWrapper/_styles.scss b/frontend/components/forms/fields/DropdownWrapper/_styles.scss
index b730b7ce86..ec7ada57b6 100644
--- a/frontend/components/forms/fields/DropdownWrapper/_styles.scss
+++ b/frontend/components/forms/fields/DropdownWrapper/_styles.scss
@@ -20,14 +20,4 @@
       height: 36px;
     }
   }
-
-  // Button-variant: background while focused so keyboard tabbing is
-  // visible. Mirrors the menuIsOpen background applied via emotion in
-  // DropdownWrapper.tsx. Inputs always match :focus-visible, so this
-  // also applies on click — that's fine since it matches the open state.
-  &__button {
-    .react-select__control:has(input:focus-visible) {
-      background-color: $ui-fleet-black-5;
-    }
-  }
 }
diff --git a/frontend/components/forms/fields/InputField/InputField.tsx b/frontend/components/forms/fields/InputField/InputField.tsx
index 69a470bf2d..a217469f05 100644
--- a/frontend/components/forms/fields/InputField/InputField.tsx
+++ b/frontend/components/forms/fields/InputField/InputField.tsx
@@ -4,6 +4,7 @@ import classnames from "classnames";
 import { PlacesType } from "react-tooltip-5";
 
 import FormField from "components/forms/FormField";
+import Button from "components/buttons/Button";
 import CopyButton from "components/buttons/CopyButton";
 import Icon from "components/Icon";
 
@@ -122,13 +123,13 @@ const InputField = ({
 
   const copyText = typeof value === "string" ? value : String(value ?? "");
 
-  // Old-style icon copy button for textarea (positioned absolutely above textarea)
+  // Copy button for textarea (positioned absolutely above textarea)
   const renderTextareaCopyButton = () => {
     return (
       <div
         className={`${baseClass}__copy-wrapper ${baseClass}__copy-wrapper--text-area`}
       >
-        <CopyButton copyText={copyText} size="small" />
+        <CopyButton copyText={copyText} variant="subdued" size="small" />
       </div>
     );
   };
@@ -140,20 +141,21 @@ const InputField = ({
         {enableCopy && (
           <CopyButton
             copyText={copyText}
+            variant="secondary"
             className={`${baseClass}__action-button`}
             tooltipOffset={10}
           />
         )}
         {enableShowSecret && (
-          <button
-            type="button"
+          <Button
+            variant="secondary"
             className={`${baseClass}__action-button`}
             onClick={onToggleSecret}
-            aria-label={showSecret ? "Hide secret" : "Show secret"}
-            aria-pressed={showSecret}
+            ariaLabel={showSecret ? "Hide secret" : "Show secret"}
+            ariaPressed={showSecret}
           >
             <Icon name="eye" />
-          </button>
+          </Button>
         )}
       </div>
     );
diff --git a/frontend/components/forms/fields/InputField/_styles.scss b/frontend/components/forms/fields/InputField/_styles.scss
index a2ff0ed251..628411de40 100644
--- a/frontend/components/forms/fields/InputField/_styles.scss
+++ b/frontend/components/forms/fields/InputField/_styles.scss
@@ -109,7 +109,7 @@
   &__input-container--has-actions {
     display: flex;
     align-items: center;
-    gap: $pad-xsmall;
+    gap: $pad-small;
 
     .input-field {
       flex: 1;
@@ -119,13 +119,11 @@
 
   &__action-buttons {
     display: flex;
-    gap: $pad-xsmall;
+    gap: $pad-small;
     flex-shrink: 0;
   }
 
   &__action-button {
-    @include bordered-icon-button;
-
     .fleeticon {
       width: 16px;
       height: 16px;
diff --git a/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.tsx b/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.tsx
index d7f211bf5f..2151ecb8a4 100644
--- a/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.tsx
+++ b/frontend/components/forms/fields/InputFieldWithIcon/InputFieldWithIcon.tsx
@@ -157,7 +157,7 @@ const InputFieldWithIcon = ({
         {clearButton && !!value && (
           <Button
             onClick={() => handleClear()}
-            variant="icon"
+            variant="subdued"
             className={`${baseClass}__clear-button`}
           >
             <Icon name="close-filled" color="core-fleet-black" />
diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx
index b360d51cb0..dd0f57fd8f 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/SelectTargetsDropdown.jsx
@@ -236,7 +236,7 @@ class SelectTargetsDropdown extends Component {
         type="button"
         className="target-select__clear"
         onMouseDown={(e) => e.preventDefault()}
-        variant="inverse"
+        variant="subdued"
       >
         <Icon name="close" />
       </Button>
diff --git a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.tsx b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.tsx
index 387303305f..9d17c9ee6b 100644
--- a/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.tsx
+++ b/frontend/components/forms/fields/SelectTargetsDropdown/TargetOption/TargetOption.tsx
@@ -78,7 +78,7 @@ const TargetOption = ({
       <Button
         className={`${baseClass}__add-btn`}
         onClick={handleSelect}
-        variant="icon"
+        variant="subdued"
         size="small"
       >
         <Icon name="plus" color="core-fleet-green" />
diff --git a/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx b/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx
index a4cb1fde15..5161e26358 100644
--- a/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx
+++ b/frontend/components/forms/packs/EditPackForm/EditPackForm.tsx
@@ -138,7 +138,7 @@ const EditPackForm = ({
         isLoadingPackQueries={isLoadingPackQueries}
       />
       <div className={`${baseClass}__pack-buttons`}>
-        <Button onClick={onCancelEditPack} type="button" variant="inverse">
+        <Button onClick={onCancelEditPack} type="button" variant="secondary">
           Cancel
         </Button>
         <Button
diff --git a/frontend/components/icons/Plus.tsx b/frontend/components/icons/Plus.tsx
index a6048b84fa..ade607fee6 100644
--- a/frontend/components/icons/Plus.tsx
+++ b/frontend/components/icons/Plus.tsx
@@ -1,15 +1,17 @@
 import React from "react";
 import { COLORS, Colors } from "styles/var/colors";
+import { ICON_SIZES, IconSizes } from "styles/var/icon_sizes";
 
 interface IPlusProps {
   color?: Colors;
+  size?: IconSizes;
 }
 
-const Plus = ({ color = "ui-fleet-black-75" }: IPlusProps) => {
+const Plus = ({ color = "ui-fleet-black-75", size = "medium" }: IPlusProps) => {
   return (
     <svg
-      width="16"
-      height="16"
+      width={ICON_SIZES[size]}
+      height={ICON_SIZES[size]}
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 16 16"
diff --git a/frontend/components/icons/Transfer.tsx b/frontend/components/icons/Transfer.tsx
index f8a3cf0f39..b1bf1005da 100644
--- a/frontend/components/icons/Transfer.tsx
+++ b/frontend/components/icons/Transfer.tsx
@@ -1,14 +1,19 @@
 import React from "react";
 import { COLORS, Colors } from "styles/var/colors";
+import { ICON_SIZES, IconSizes } from "styles/var/icon_sizes";
 
 interface ITransfer {
   color?: Colors;
+  size?: IconSizes;
 }
-const Transfer = ({ color = "ui-fleet-black-75" }: ITransfer) => {
+const Transfer = ({
+  color = "ui-fleet-black-75",
+  size = "medium",
+}: ITransfer) => {
   return (
     <svg
-      width="16"
-      height="16"
+      width={ICON_SIZES[size]}
+      height={ICON_SIZES[size]}
       fill="none"
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 16 16"
diff --git a/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx b/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx
index 3785bec869..241df0666d 100644
--- a/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx
+++ b/frontend/components/queries/LiveResults/LiveResultsHeading/LiveResultsHeading.tsx
@@ -28,7 +28,7 @@ const FinishedButtons = ({
     <Button
       className={`${baseClass}__run-btn`}
       onClick={onClickRunAgain}
-      variant="brand-inverse-icon"
+      variant="secondary"
     >
       Run again
     </Button>
diff --git a/frontend/components/queries/PackQueriesTable/PackQueriesTable.tsx b/frontend/components/queries/PackQueriesTable/PackQueriesTable.tsx
index 07d0fa936a..8d45504692 100644
--- a/frontend/components/queries/PackQueriesTable/PackQueriesTable.tsx
+++ b/frontend/components/queries/PackQueriesTable/PackQueriesTable.tsx
@@ -94,15 +94,14 @@ const PackQueriesTable = ({
             name: "add query",
             buttonText: "Add query",
             iconSvg: "plus",
-            iconColor: "core-fleet-green",
-            variant: "brand-inverse-icon",
+            variant: "secondary",
             onClick: onAddPackQuery,
           }}
           primarySelectAction={{
             name: "remove query",
             buttonText: "Remove",
             iconSvg: "close",
-            variant: "inverse",
+            variant: "secondary",
             onClick: onRemovePackQueries,
           }}
           searchable
@@ -114,14 +113,10 @@ const PackQueriesTable = ({
         <EmptyState
           header="Your pack has no reports"
           primaryButton={
-            <Button
-              onClick={onAddPackQuery}
-              variant="brand-inverse-icon"
-              iconStroke
-            >
+            <Button onClick={onAddPackQuery} variant="secondary">
               <>
                 Add report
-                <Icon name="plus" color="core-fleet-green" />
+                <Icon name="plus" />
               </>
             </Button>
           }
diff --git a/frontend/components/queries/PackQueriesTable/PackQueriesTable/PackQueriesTableConfig.tsx b/frontend/components/queries/PackQueriesTable/PackQueriesTable/PackQueriesTableConfig.tsx
index be3f452bec..152dd412e3 100644
--- a/frontend/components/queries/PackQueriesTable/PackQueriesTable/PackQueriesTableConfig.tsx
+++ b/frontend/components/queries/PackQueriesTable/PackQueriesTable/PackQueriesTableConfig.tsx
@@ -189,7 +189,7 @@ const generateTableHeaders = (
             actionSelectHandler(value, cellProps.row.original)
           }
           placeholder="Actions"
-          variant="small-button"
+          variant="secondary"
         />
       ),
     },
diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/components/ScriptBatchHostCountCell/ScriptBatchHostCountCell.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/components/ScriptBatchHostCountCell/ScriptBatchHostCountCell.tsx
index f9d2e0a7b6..127bb760aa 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/components/ScriptBatchHostCountCell/ScriptBatchHostCountCell.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/components/ScriptBatchHostCountCell/ScriptBatchHostCountCell.tsx
@@ -37,7 +37,7 @@ const ScriptBatchHostCountCell = ({
       <Button
         className={`${baseClass}__cancel-button`}
         onClick={onClickCancel}
-        variant="inverse"
+        variant="secondary"
       >
         Cancel
       </Button>
diff --git a/frontend/pages/DashboardPage/cards/ChartCard/ChartCard.tsx b/frontend/pages/DashboardPage/cards/ChartCard/ChartCard.tsx
index 21f56a7ad0..cf30715c4d 100644
--- a/frontend/pages/DashboardPage/cards/ChartCard/ChartCard.tsx
+++ b/frontend/pages/DashboardPage/cards/ChartCard/ChartCard.tsx
@@ -482,7 +482,7 @@ const ChartCard = ({
         <div className={`${baseClass}__header-right`}>
           <Button
             type="button"
-            variant="inverse"
+            variant="subdued"
             className={`${baseClass}__settings-btn`}
             ariaLabel="Configure chart filters"
             onClick={() => openFilterModal()}
diff --git a/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/ChartFilterModal.tsx b/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/ChartFilterModal.tsx
index 99b6c066f1..b213c22af5 100644
--- a/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/ChartFilterModal.tsx
+++ b/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/ChartFilterModal.tsx
@@ -415,12 +415,12 @@ const ChartFilterModal = ({
       )}
       <div className={`${baseClass}__btn-wrap`}>
         {hasFilters && (
-          <Button variant="inverse" onClick={handleClear}>
+          <Button variant="secondary" onClick={handleClear}>
             Clear all
           </Button>
         )}
         <div className={`${baseClass}__btn-actions`}>
-          <Button variant="inverse" onClick={onCancel}>
+          <Button variant="secondary" onClick={onCancel}>
             Cancel
           </Button>
           {applyDisabled ? (
diff --git a/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/SoftwareFilters/SoftwareFilters.tsx b/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/SoftwareFilters/SoftwareFilters.tsx
index 83846f8177..36f33682c4 100644
--- a/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/SoftwareFilters/SoftwareFilters.tsx
+++ b/frontend/pages/DashboardPage/cards/ChartCard/ChartFilterModal/SoftwareFilters/SoftwareFilters.tsx
@@ -168,6 +168,7 @@ const SoftwareFilters = ({
         hideText="Advanced options"
         caretPosition="after"
         onClick={() => setShowAdvanced((prev) => !prev)}
+        variant="secondary"
       />
 
       {showAdvanced && (
diff --git a/frontend/pages/DashboardPage/cards/ChartCard/_styles.scss b/frontend/pages/DashboardPage/cards/ChartCard/_styles.scss
index 4a34d83873..a601d33497 100644
--- a/frontend/pages/DashboardPage/cards/ChartCard/_styles.scss
+++ b/frontend/pages/DashboardPage/cards/ChartCard/_styles.scss
@@ -126,7 +126,7 @@
   }
 
   &__settings-btn {
-    // Button variant="inverse" applies a 36px height that would make the
+    // Button variant="subdued" applies a 36px height that would make the
     // chart-card header taller than HostsEnrolledCard's bare h2 next door.
     // Shrink to content height so headers match.
     display: flex;
diff --git a/frontend/pages/DashboardPage/cards/Software/SoftwareTableConfig.tsx b/frontend/pages/DashboardPage/cards/Software/SoftwareTableConfig.tsx
index c38bf99367..dba46b4aa5 100644
--- a/frontend/pages/DashboardPage/cards/Software/SoftwareTableConfig.tsx
+++ b/frontend/pages/DashboardPage/cards/Software/SoftwareTableConfig.tsx
@@ -77,6 +77,7 @@ const generateTableHeaders = (teamId?: number): IDataColumn[] => [
           queryParams={{ software_id: cellProps.cell.value, fleet_id: teamId }} // TODO: Should redirect with the current team id?
           className="software-link"
           condensed
+          rowHover
         />
       );
     },
diff --git a/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx b/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx
index e2b320ab17..674d24e1b6 100644
--- a/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx
+++ b/frontend/pages/DashboardPage/components/ActivityFeedAutomationsModal/ActivityFeedAutomationsModal.tsx
@@ -171,6 +171,7 @@ const ActivityFeedAutomationsModal = ({
           onClick={() => {
             setShowExamplePayload(!showExamplePayload);
           }}
+          variant="secondary"
         />
         {showExamplePayload && renderExamplePayload()}
         <div className="modal-cta-wrap">
@@ -183,7 +184,7 @@ const ActivityFeedAutomationsModal = ({
           >
             Save
           </Button>
-          <Button onClick={onExit} variant="inverse">
+          <Button onClick={onExit} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/DashboardPage/components/InfoCard/InfoCard.tsx b/frontend/pages/DashboardPage/components/InfoCard/InfoCard.tsx
index e3ca2cacdf..52beef53e7 100644
--- a/frontend/pages/DashboardPage/components/InfoCard/InfoCard.tsx
+++ b/frontend/pages/DashboardPage/components/InfoCard/InfoCard.tsx
@@ -4,7 +4,6 @@ import { browserHistory } from "react-router";
 import Card from "components/Card";
 import Button from "components/buttons/Button";
 import AutomationsButton from "components/buttons/AutomationsButton";
-import Icon from "components/Icon";
 import classnames from "classnames";
 
 interface IInfoCardProps {
@@ -78,7 +77,7 @@ const useInfoCard = ({
         return (
           <Button
             className={`${baseClass}__action-button`}
-            variant="inverse"
+            variant="secondary"
             size="small"
             onClick={action.onClick}
           >
@@ -99,7 +98,7 @@ const useInfoCard = ({
 
         return (
           <Button
-            variant="inverse"
+            variant="secondary"
             onClick={onClick}
             className={`${baseClass}__action-button`}
             size="small"
@@ -107,7 +106,6 @@ const useInfoCard = ({
             <span className={`${baseClass}__action-button-text`}>
               {action.text}
             </span>
-            <Icon name="arrow-internal-link" color="ui-fleet-black-75" />
           </Button>
         );
       }
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/Certificates.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/Certificates.tsx
index 1d4eaa3bbe..4c88924f49 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/Certificates.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/Certificates.tsx
@@ -230,7 +230,7 @@ const Certificates = ({
                   <ActionsDropdown
                     options={certActions}
                     placeholder="Actions"
-                    variant="small-button"
+                    variant="secondary"
                     menuAlign="right"
                     menuPlacement="auto"
                     onChange={(action) => onSelectCertAction(action, listItem)}
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx
index a4d9e28b87..a938796002 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/AddCertificateModal/AddCertificateModal.tsx
@@ -233,7 +233,7 @@ const AddCertModal = ({
           <Button isLoading={isUpdating} disabled={isUpdating} type="submit">
             Add
           </Button>
-          <Button variant="inverse" onClick={onExit}>
+          <Button variant="secondary" onClick={onExit}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/DeleteCertificateModal/DeleteCertificateModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/DeleteCertificateModal/DeleteCertificateModal.tsx
index 2387058d14..c5d5d0f5ba 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/DeleteCertificateModal/DeleteCertificateModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/Certificates/components/DeleteCertificateModal/DeleteCertificateModal.tsx
@@ -54,7 +54,7 @@ const DeleteCertificateModal = ({
         >
           Delete
         </Button>
-        <Button variant="inverse-alert" onClick={onExit}>
+        <Button variant="secondary" onClick={onExit}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AddAssetModal/AddAssetModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AddAssetModal/AddAssetModal.tsx
index 7ffc390392..c978e48096 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AddAssetModal/AddAssetModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AddAssetModal/AddAssetModal.tsx
@@ -38,12 +38,12 @@ const FileChooser = ({ isLoading, onFileOpen }: IFileChooserProps) => {
       </span>
       <Button
         className={`${baseClass}__upload-button`}
-        variant="brand-inverse-icon"
+        variant="secondary"
         isLoading={isLoading}
         onClick={() => inputRef.current?.click()}
       >
         <span className={`${baseClass}__file-chooser--button-wrap`}>
-          Choose file <Icon name="upload" color="core-fleet-green" />
+          Choose file <Icon name="upload" />
         </span>
       </Button>
       <input
@@ -153,7 +153,7 @@ const AddAssetModal = ({
           >
             Add asset
           </Button>
-          <Button variant="inverse" onClick={onDone}>
+          <Button variant="secondary" onClick={onDone}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/AssetListItem.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/AssetListItem.tsx
index 7b36d86829..6050ae1a4a 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/AssetListItem.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/AssetListItem.tsx
@@ -65,7 +65,7 @@ const AssetListItem = ({
     <>
       <Button
         className={`${baseClass}__action-button`}
-        variant="icon"
+        variant="secondary"
         onClick={onClickDownload}
         ariaLabel={`Download ${asset.name}`}
       >
@@ -77,7 +77,7 @@ const AssetListItem = ({
             <Button
               disabled={disableChildren}
               className={`${baseClass}__action-button`}
-              variant="icon"
+              variant="secondary"
               onClick={() => onClickDelete(asset)}
               ariaLabel={`Delete ${asset.name}`}
             >
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/_styles.scss b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/_styles.scss
index ead70e5014..0e2eda8e2f 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/_styles.scss
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/AssetListItem/_styles.scss
@@ -20,10 +20,4 @@
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-
-  .list-item__actions {
-    .button--icon {
-      @include bordered-icon-button;
-    }
-  }
 }
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/ConfigProfileHostCountCell.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/ConfigProfileHostCountCell.tsx
index 6564f39039..32ea3d98aa 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/ConfigProfileHostCountCell.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/ConfigProfileHostCountCell.tsx
@@ -1,13 +1,10 @@
 import React from "react";
 
-import PATHS from "router/paths";
-
 import { DEFAULT_EMPTY_CELL_VALUE } from "utilities/constants";
-import { buildQueryStringFromParams } from "utilities/url";
 
-import CustomLink from "components/CustomLink";
 import Button from "components/buttons/Button";
 import Icon from "components/Icon";
+import ViewAllHostsLink from "components/ViewAllHostsLink";
 
 const baseClass = "config-profile-host-count-cell";
 
@@ -26,20 +23,6 @@ const ConfigProfileHostCountCell = ({
   count,
   onClickResend,
 }: IConfigProfileHostCountCellProps) => {
-  const hostPath = `${PATHS.MANAGE_HOSTS}?${buildQueryStringFromParams({
-    fleet_id: teamId,
-    profile_uuid: uuid,
-    profile_status: status,
-  })}`;
-
-  const renderCount = () => {
-    if (count === 0) {
-      return <div>{DEFAULT_EMPTY_CELL_VALUE}</div>;
-    }
-
-    return <CustomLink url={hostPath} text={count.toString()} />;
-  };
-
   const renderResendButton = () => {
     // we check if the count is 0 or if the uuid starts with "d" which means it
     // is a DDM profile.
@@ -51,7 +34,8 @@ const ConfigProfileHostCountCell = ({
       <Button
         className={`${baseClass}__resend-button`}
         onClick={onClickResend}
-        variant="inverse"
+        variant="secondary"
+        size="small"
       >
         <Icon name="refresh" color="ui-fleet-black-75" size="small" />
         <span>Resend</span>
@@ -59,10 +43,25 @@ const ConfigProfileHostCountCell = ({
     );
   };
 
+  if (count === 0) {
+    return <div className={baseClass}>{DEFAULT_EMPTY_CELL_VALUE}</div>;
+  }
+
   return (
     <div className={baseClass}>
-      <>{renderCount()}</>
-      <>{renderResendButton()}</>
+      <div>{count}</div>
+      <div className={`${baseClass}__actions`}>
+        {renderResendButton()}
+        <ViewAllHostsLink
+          queryParams={{
+            fleet_id: teamId,
+            profile_uuid: uuid,
+            profile_status: status,
+          }}
+          condensed
+          rowHover
+        />
+      </div>
     </div>
   );
 };
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/_styles.scss b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/_styles.scss
index ca229dcdc9..1edfdbca01 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/_styles.scss
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ConfigProfileHostCountCell/_styles.scss
@@ -3,10 +3,16 @@
   justify-content: space-between;
   align-items: center;
 
-  .children-wrapper {
-    .icon {
-      vertical-align: middle;
-      margin-right: 8px;
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: $pad-small;
+
+    // ViewAllHostsButton's condensed modifier reserves margin-right to clear
+    // DataTable's horizontal-scroll shadow-fade on wide tables. This table is
+    // fixed-width and never scrolls, so it just leaves a stray gap here.
+    .view-all-hosts-button__condensed {
+      margin-right: 0;
     }
   }
 }
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteAssetModal/DeleteAssetModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteAssetModal/DeleteAssetModal.tsx
index dafa651acb..6dc7288363 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteAssetModal/DeleteAssetModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteAssetModal/DeleteAssetModal.tsx
@@ -43,7 +43,7 @@ const DeleteAssetModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteProfileModal/DeleteProfileModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteProfileModal/DeleteProfileModal.tsx
index 3f6a74911d..06fa146d49 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteProfileModal/DeleteProfileModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/DeleteProfileModal/DeleteProfileModal.tsx
@@ -59,7 +59,7 @@ const DeleteProfileModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/EditProfileModal/EditProfileModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/EditProfileModal/EditProfileModal.tsx
index a23a3c64a8..5f5e471b0b 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/EditProfileModal/EditProfileModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/EditProfileModal/EditProfileModal.tsx
@@ -278,7 +278,7 @@ const EditProfileModal = ({
             />
           )}
           <div className={`${baseClass}__button-wrap`}>
-            <Button variant="inverse" onClick={onCancel}>
+            <Button variant="secondary" onClick={onCancel}>
               Cancel
             </Button>
             <GitOpsModeTooltipWrapper
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/ProfileListItem.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/ProfileListItem.tsx
index 44970d89de..3f31c2cdef 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/ProfileListItem.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/ProfileListItem.tsx
@@ -191,7 +191,7 @@ const ProfileListItem = ({
         <div className={`${subClass}__actions`}>
           <Button
             className={`${subClass}__action-button`}
-            variant="icon"
+            variant="secondary"
             onClick={() => onClickInfo(profile)}
           >
             <Icon name="info" size="medium" />
@@ -201,7 +201,7 @@ const ProfileListItem = ({
             // see a profile's label targeting; it blocks saving instead
             <Button
               className={`${subClass}__action-button`}
-              variant="icon"
+              variant="secondary"
               onClick={() => onClickEdit(profile)}
               ariaLabel={`Edit ${profile.name}`}
             >
@@ -210,7 +210,7 @@ const ProfileListItem = ({
           )}
           <Button
             className={`${subClass}__action-button`}
-            variant="icon"
+            variant="secondary"
             onClick={onClickDownload}
           >
             <Icon name="download" />
@@ -221,7 +221,7 @@ const ProfileListItem = ({
                 <Button
                   disabled={disableChildren}
                   className={`${subClass}__action-button`}
-                  variant="icon"
+                  variant="secondary"
                   onClick={() => onClickDelete(profile)}
                 >
                   <Icon name="trash" />
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/_styles.scss b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/_styles.scss
index 7257778e6e..f9674d3d79 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/_styles.scss
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileListItem/_styles.scss
@@ -21,12 +21,6 @@
     font-size: $xx-small;
   }
 
-  .list-item__actions {
-    .button--icon {
-      @include bordered-icon-button;
-    }
-  }
-
   .list-item__actions-wrap {
     display: flex;
     flex-shrink: 0;
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileUploader/components/AddProfileModal/AddProfileModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileUploader/components/AddProfileModal/AddProfileModal.tsx
index aafa29dedc..361df73b28 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileUploader/components/AddProfileModal/AddProfileModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ProfileUploader/components/AddProfileModal/AddProfileModal.tsx
@@ -61,12 +61,12 @@ const FileChooser = ({ isLoading, onFileOpen }: IFileChooserProps) => (
     />
     <Button
       className={`${baseClass}__upload-button`}
-      variant="brand-inverse-icon"
+      variant="secondary"
       isLoading={isLoading}
     >
       <label htmlFor="upload-profile">
         <span className={`${baseClass}__file-chooser--button-wrap`}>
-          Choose file <Icon name="upload" color="core-fleet-green" />
+          Choose file <Icon name="upload" />
         </span>
       </label>
     </Button>
@@ -279,7 +279,7 @@ const AddProfileModal = ({
             </div>
           )}
           <div className={`${baseClass}__button-wrap`}>
-            <Button variant="inverse" onClick={onDone}>
+            <Button variant="secondary" onClick={onDone}>
               Cancel
             </Button>
             <Button
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ResendConfigProfileModal/ResendConfigProfileModal.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ResendConfigProfileModal/ResendConfigProfileModal.tsx
index 124b98887d..f6a597f5cb 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ResendConfigProfileModal/ResendConfigProfileModal.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/ConfigurationProfiles/components/ResendConfigProfileModal/ResendConfigProfileModal.tsx
@@ -63,7 +63,7 @@ const ResendConfigProfileModal = ({
         >
           Resend
         </Button>
-        <Button variant="inverse" onClick={onExit} disabled={isResending}>
+        <Button variant="secondary" onClick={onExit} disabled={isResending}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx
index 06c3e235b4..c9796a9512 100644
--- a/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx
+++ b/frontend/pages/ManageControlsPage/OSSettings/cards/DiskEncryption/DiskEncryption.tsx
@@ -237,6 +237,7 @@ const DiskEncryption = ({
             hideText="Advanced options"
             caretPosition="after"
             onClick={() => setShowAdvancedOptions(!showAdvancedOptions)}
+            variant="secondary"
           />
           {showAdvancedOptions && (
             <Checkbox
diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTable.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTable.tsx
index 877608a319..d08d3ab525 100644
--- a/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTable.tsx
+++ b/frontend/pages/ManageControlsPage/OSUpdates/components/OSVersionTable/OSVersionTable.tsx
@@ -1,9 +1,11 @@
 import React, { useCallback } from "react";
+import { Row } from "react-table";
 import { InjectedRouter } from "react-router";
 
 import PATHS from "router/paths";
 import { IOperatingSystemVersion } from "interfaces/operating_system";
 import { getNextLocationPath } from "utilities/helpers";
+import { getPathWithQueryParams } from "utilities/url";
 
 import { ITableQueryData } from "components/TableContainer/TableContainer";
 import TableContainer from "components/TableContainer";
@@ -14,6 +16,14 @@ import { parseOSUpdatesCurrentVersionsQueryParams } from "../CurrentVersionSecti
 
 const baseClass = "os-version-table";
 
+interface IRowProps extends Row {
+  original: {
+    id?: number;
+    name_only?: string;
+    version?: string;
+  };
+}
+
 interface IOSVersionTableProps {
   router: InjectedRouter;
   osVersionData: IOperatingSystemVersion[];
@@ -89,6 +99,22 @@ const OSVersionTable = ({
     [determineQueryParamChange, generateNewQueryParams, router]
   );
 
+  const onSelectSingleRow = useCallback(
+    (row: IRowProps) => {
+      const { name_only, version } = row.original;
+
+      const hostsQueryParams = {
+        os_name: name_only,
+        os_version: version,
+        fleet_id: currentTeamId,
+      };
+      const path = getPathWithQueryParams(PATHS.MANAGE_HOSTS, hostsQueryParams);
+
+      router.push(path);
+    },
+    [router, currentTeamId]
+  );
+
   return (
     <div className={baseClass}>
       <TableContainer
@@ -108,6 +134,9 @@ const OSVersionTable = ({
         onQueryChange={onQueryChange}
         disableNextPage={!hasNextPage}
         hideFooter={!hasNextPage && queryParams.page === 0}
+        // these 2 properties allow linking on click anywhere in the row
+        disableMultiRowSelect
+        onSelectSingleRow={onSelectSingleRow}
       />
     </div>
   );
diff --git a/frontend/pages/ManageControlsPage/Scripts/ScriptBatchDetailsPage/ScriptBatchDetailsPage.tsx b/frontend/pages/ManageControlsPage/Scripts/ScriptBatchDetailsPage/ScriptBatchDetailsPage.tsx
index 3b21c4c854..ea2f5c22e7 100644
--- a/frontend/pages/ManageControlsPage/Scripts/ScriptBatchDetailsPage/ScriptBatchDetailsPage.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/ScriptBatchDetailsPage/ScriptBatchDetailsPage.tsx
@@ -281,7 +281,7 @@ const ScriptBatchDetailsPage = ({
                 {
                   type: "secondary",
                   label: "Show script",
-                  buttonVariant: "inverse",
+                  buttonVariant: "secondary",
                   iconName: "eye",
                   onClick: () => {
                     setShowBatchScriptDetails(true);
diff --git a/frontend/pages/ManageControlsPage/Scripts/_styles.scss b/frontend/pages/ManageControlsPage/Scripts/_styles.scss
index 34bf8d77cc..b131bf59c1 100644
--- a/frontend/pages/ManageControlsPage/Scripts/_styles.scss
+++ b/frontend/pages/ManageControlsPage/Scripts/_styles.scss
@@ -11,9 +11,11 @@
       // opacity/pointer-events (not display:none) so action buttons stay in
       // the tab order in both directions. display:none would remove them from
       // layout and tab order, breaking Shift+Tab reversal.
+      // Gap between the buttons is set in ScriptListItem's own styles — not
+      // duplicated here, since an equally-specific selector on both would make
+      // the winner depend on SCSS compile order.
       display: flex;
       justify-content: flex-end;
-      gap: $pad-medium;
       opacity: 0;
       pointer-events: none;
       transition: opacity 150ms ease-in-out;
diff --git a/frontend/pages/ManageControlsPage/Scripts/cards/ScriptLibrary/ScriptLibrary.tsx b/frontend/pages/ManageControlsPage/Scripts/cards/ScriptLibrary/ScriptLibrary.tsx
index 0747f35d1f..63795bd4d1 100644
--- a/frontend/pages/ManageControlsPage/Scripts/cards/ScriptLibrary/ScriptLibrary.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/cards/ScriptLibrary/ScriptLibrary.tsx
@@ -24,6 +24,7 @@ import InfoBanner from "components/InfoBanner";
 import Spinner from "components/Spinner";
 import Pagination from "components/Pagination";
 import SectionHeader from "components/SectionHeader";
+import PageDescription from "components/PageDescription";
 import EmptyState from "components/EmptyState";
 import Button from "components/buttons/Button";
 import GitOpsModeTooltipWrapper from "components/GitOpsModeTooltipWrapper";
@@ -209,6 +210,10 @@ const ScriptLibrary = ({ router, teamId, location }: IScriptLibraryProps) => {
   return (
     <div className={baseClass}>
       <SectionHeader title="Library" alignLeftHeaderVertically />
+      <PageDescription
+        variant="right-panel"
+        content="A collection of scripts for configuring and remediating hosts."
+      />
       {config.server_settings.scripts_disabled && renderScriptsDisabledBanner()}
       {renderScriptsList()}
       {!isLoading && !isError && currentPage === 0 && !scripts?.length && (
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/CancelScriptBatchModal/CancelScriptBatchModal.tsx b/frontend/pages/ManageControlsPage/Scripts/components/CancelScriptBatchModal/CancelScriptBatchModal.tsx
index a876bd13df..6842c48020 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/CancelScriptBatchModal/CancelScriptBatchModal.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/CancelScriptBatchModal/CancelScriptBatchModal.tsx
@@ -44,7 +44,7 @@ const CancelScriptBatchModal = ({
           >
             Cancel script
           </Button>
-          <Button variant="inverse-alert" onClick={onExit}>
+          <Button variant="secondary" onClick={onExit}>
             Back
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/DeleteScriptModal/DeleteScriptModal.tsx b/frontend/pages/ManageControlsPage/Scripts/components/DeleteScriptModal/DeleteScriptModal.tsx
index f64718144d..f608fa93ed 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/DeleteScriptModal/DeleteScriptModal.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/DeleteScriptModal/DeleteScriptModal.tsx
@@ -76,7 +76,7 @@ const DeleteScriptModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx b/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx
index 11a285a8d7..f5e3bde2d1 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/EditScriptModal/EditScriptModal.tsx
@@ -59,7 +59,7 @@ const WarningModal = ({
         >
           Save
         </Button>
-        <Button onClick={onExit} variant="inverse">
+        <Button onClick={onExit} variant="secondary">
           Cancel
         </Button>
       </div>
@@ -209,7 +209,7 @@ const EditScriptModal = ({
           <ModalFooter
             primaryButtons={
               <>
-                <Button onClick={onExit} variant="inverse">
+                <Button onClick={onExit} variant="secondary">
                   Cancel
                 </Button>
                 <GitOpsModeTooltipWrapper
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/RerunScriptModal/RerunScriptModal.tsx b/frontend/pages/ManageControlsPage/Scripts/components/RerunScriptModal/RerunScriptModal.tsx
index 02b6b10b3b..86040cb92c 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/RerunScriptModal/RerunScriptModal.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/RerunScriptModal/RerunScriptModal.tsx
@@ -49,7 +49,7 @@ const RerunScriptModal = ({
           <Button type="button" onClick={() => onRerun(scriptId)}>
             Rerun
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/ScriptListHeading/ScriptListHeading.tsx b/frontend/pages/ManageControlsPage/Scripts/components/ScriptListHeading/ScriptListHeading.tsx
index 0b57337625..b27ce13dba 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/ScriptListHeading/ScriptListHeading.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/ScriptListHeading/ScriptListHeading.tsx
@@ -20,13 +20,13 @@ const ScriptListHeading = ({ onClickAddScript }: IScriptListHeading) => {
             renderChildren={(disableChildren) => (
               <Button
                 disabled={disableChildren}
-                variant="brand-inverse-icon"
+                variant="secondary"
+                size="small"
                 className={`${baseClass}__add-button`}
                 onClick={onClickAddScript}
-                iconStroke
               >
                 <>
-                  <Icon name="plus" color="core-fleet-green" />
+                  <Icon name="plus" size="small" />
                   Add script
                 </>
               </Button>
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/ScriptListItem.tsx b/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/ScriptListItem.tsx
index d4fa0abc81..09489a58e7 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/ScriptListItem.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/ScriptListItem.tsx
@@ -99,14 +99,17 @@ const ScriptListItem = ({
   };
 
   const actions = (
-    <div onClick={(evt) => evt.stopPropagation()}>
+    <div
+      className={`${baseClass}__actions`}
+      onClick={(evt) => evt.stopPropagation()}
+    >
       <GitOpsModeTooltipWrapper
         renderChildren={(disableChildren) => (
           <Button
             disabled={disableChildren}
             onClick={onClickEdit}
             className={`${baseClass}__action-button`}
-            variant="icon"
+            variant="secondary"
             ariaLabel={`Edit ${script.name}`}
           >
             <Icon name="pencil" />
@@ -115,7 +118,7 @@ const ScriptListItem = ({
       />
       <Button
         className={`${baseClass}__action-button`}
-        variant="icon"
+        variant="secondary"
         onClick={onClickDownload}
         ariaLabel={`Download ${script.name}`}
       >
@@ -127,7 +130,7 @@ const ScriptListItem = ({
             disabled={disableChildren}
             onClick={onClickDelete}
             className={`${baseClass}__action-button`}
-            variant="icon"
+            variant="secondary"
             ariaLabel={`Delete ${script.name}`}
           >
             <Icon name="trash" />
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/_styles.scss b/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/_styles.scss
index 41adbeb3f0..9f7b257237 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/_styles.scss
+++ b/frontend/pages/ManageControlsPage/Scripts/components/ScriptListItem/_styles.scss
@@ -37,10 +37,12 @@
     }
   }
 
-  &__action-button {
-    width: 40px;
-    height: 40px;
+  &__actions {
+    display: flex;
+    align-items: center;
+    gap: $pad-medium;
   }
+
   &__details {
     display: flex;
     gap: $pad-xxsmall;
diff --git a/frontend/pages/ManageControlsPage/Scripts/components/ScriptUploader/ScriptUploader.tsx b/frontend/pages/ManageControlsPage/Scripts/components/ScriptUploader/ScriptUploader.tsx
index 25bc8c2f8f..f91799b6d2 100644
--- a/frontend/pages/ManageControlsPage/Scripts/components/ScriptUploader/ScriptUploader.tsx
+++ b/frontend/pages/ManageControlsPage/Scripts/components/ScriptUploader/ScriptUploader.tsx
@@ -25,7 +25,7 @@ const ScriptPackageUploader = ({
     }
   };
 
-  const buttonType = forModal ? "brand-inverse-icon" : undefined;
+  const buttonType = forModal ? "secondary" : undefined;
   const buttonMessage = forModal ? "Choose file" : "Add script";
   const extension = selectedFile?.name.match(/(sh|py|ps1)$/i)?.[1];
   let graphicName: ISupportedGraphicNames[];
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapAdvancedOptions/BootstrapAdvancedOptions.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapAdvancedOptions/BootstrapAdvancedOptions.tsx
index 7dec83e21e..f23873763e 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapAdvancedOptions/BootstrapAdvancedOptions.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapAdvancedOptions/BootstrapAdvancedOptions.tsx
@@ -62,6 +62,7 @@ const BootstrapAdvancedOptions = ({
         hideText="Advanced options"
         caretPosition="after"
         onClick={() => setShowAdvancedOptions(!showAdvancedOptions)}
+        variant="secondary"
       />
       {showAdvancedOptions && (
         <form onSubmit={onSubmit}>
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageListItem/BootstrapPackageListItem.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageListItem/BootstrapPackageListItem.tsx
index 715136e385..1f14ea27be 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageListItem/BootstrapPackageListItem.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/BootstrapPackageListItem/BootstrapPackageListItem.tsx
@@ -41,7 +41,7 @@ const DownloadPackageButton = ({ url, token, className }: ITestFormProps) => {
     >
       <input type="hidden" name="token" value={token || ""} />
       <Button
-        variant="icon"
+        variant="subdued"
         type="submit"
         className={`${baseClass}__list-item-button`}
       >
@@ -87,7 +87,7 @@ const BootstrapPackageListItem = ({
           renderChildren={(disabled) => (
             <Button
               className={`${baseClass}__list-item-button`}
-              variant="icon"
+              variant="subdued"
               disabled={disabled}
               onClick={() => onDelete(bootstrapPackage)}
             >
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/DeleteBootstrapPackageModal/DeleteBootstrapPackageModal.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/DeleteBootstrapPackageModal/DeleteBootstrapPackageModal.tsx
index 1f9c595953..9413ab8a32 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/DeleteBootstrapPackageModal/DeleteBootstrapPackageModal.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/BootstrapPackage/components/DeleteBootstrapPackageModal/DeleteBootstrapPackageModal.tsx
@@ -35,7 +35,7 @@ const DeleteBootstrapPackageModal = ({
           <Button type="button" onClick={() => onDelete()} variant="alert">
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/DeleteSetupExperienceScriptModal/DeleteSetupExperienceScriptModal.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/DeleteSetupExperienceScriptModal/DeleteSetupExperienceScriptModal.tsx
index 0df2535968..8c259f2d24 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/DeleteSetupExperienceScriptModal/DeleteSetupExperienceScriptModal.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/DeleteSetupExperienceScriptModal/DeleteSetupExperienceScriptModal.tsx
@@ -63,7 +63,7 @@ const DeleteSetupExperienceScriptModal = ({
         >
           Delete
         </Button>
-        <Button onClick={onExit} variant="inverse-alert">
+        <Button onClick={onExit} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/SetupExperienceScriptCard.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/SetupExperienceScriptCard.tsx
index cab9b957de..f6d324355c 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/SetupExperienceScriptCard.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/SetupExperienceScriptCard.tsx
@@ -55,14 +55,14 @@ const SetupExperienceScriptCard = ({
       <div className={`${baseClass}__actions`}>
         <Button
           className={`${baseClass}__download-button`}
-          variant="icon"
+          variant="secondary"
           onClick={onDownload}
         >
           <Icon name="download" />
         </Button>
         <Button
           className={`${baseClass}__delete-button`}
-          variant="icon"
+          variant="secondary"
           onClick={onDelete}
         >
           <Icon name="trash" color="ui-fleet-black-75" />
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/_styles.scss b/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/_styles.scss
index 902afafabb..fc23d059bf 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/_styles.scss
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/RunScript/components/SetupExperienceScriptCard/_styles.scss
@@ -24,9 +24,4 @@
     flex: 1;
     justify-content: flex-end;
   }
-
-  &__download-button,
-  &__delete-button {
-    padding: 11px; // TODO: use a padding value from existing variables. talk to design.
-  }
 }
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/AdvancedOptionsForm/AdvancedOptionsForm.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/AdvancedOptionsForm/AdvancedOptionsForm.tsx
index 7242d9bc4c..cae568fa5c 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/AdvancedOptionsForm/AdvancedOptionsForm.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/AdvancedOptionsForm/AdvancedOptionsForm.tsx
@@ -51,6 +51,7 @@ const AdvancedOptionsForm = ({
         hideText="Advanced options"
         caretPosition="after"
         onClick={() => setShowAdvancedOptions(!showAdvancedOptions)}
+        variant="secondary"
       />
       {showAdvancedOptions && (
         <form onSubmit={handleSubmit}>
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/DeleteAutoEnrollmentProfile/DeleteAutoEnrollmentProfile.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/DeleteAutoEnrollmentProfile/DeleteAutoEnrollmentProfile.tsx
index 1eff019fcb..030e01c7d4 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/DeleteAutoEnrollmentProfile/DeleteAutoEnrollmentProfile.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/DeleteAutoEnrollmentProfile/DeleteAutoEnrollmentProfile.tsx
@@ -44,7 +44,7 @@ const DeleteAutoEnrollProfile = ({
         <Button type="button" onClick={handleDelete} variant="alert">
           Delete
         </Button>
-        <Button onClick={onCancel} variant="inverse-alert">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/SetupAssistantProfileCard.tsx b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/SetupAssistantProfileCard.tsx
index ca359c1635..906c0e3fc0 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/SetupAssistantProfileCard.tsx
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/SetupAssistantProfileCard.tsx
@@ -81,7 +81,7 @@ const SetupAssistantProfileCard = (props: ISetupAssistantProfileCardProps) => {
       <div className={`${baseClass}__actions`}>
         <Button
           className={`${baseClass}__download-button`}
-          variant="icon"
+          variant="secondary"
           onClick={onDownload}
         >
           <Icon name="download" />
@@ -89,7 +89,7 @@ const SetupAssistantProfileCard = (props: ISetupAssistantProfileCardProps) => {
         {!props.defaultProfile && (
           <Button
             className={`${baseClass}__delete-button`}
-            variant="icon"
+            variant="secondary"
             onClick={props.onDelete}
           >
             <Icon name="trash" />
diff --git a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/_styles.scss b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/_styles.scss
index 09c6b8bff5..b392601b52 100644
--- a/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/_styles.scss
+++ b/frontend/pages/ManageControlsPage/SetupExperience/cards/SetupAssistant/components/SetupAssistantProfileCard/_styles.scss
@@ -30,8 +30,4 @@
     flex: 1;
     justify-content: flex-end;
   }
-
-  &__download-button, &__delete-button {
-    padding: 11px; // TODO: use a padding value from existing variables. talk to design.
-  }
 }
\ No newline at end of file
diff --git a/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTab.tsx b/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTab.tsx
index d33e7bad90..88c22575ce 100644
--- a/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTab.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTab.tsx
@@ -155,17 +155,17 @@ const CustomHostVitalsTab: React.FC<IVariablesCardProps> = ({
   // search as the search-empty case.
   const isEmpty = !isLoading && count === 0 && !isSearching;
 
-  const renderAddButton = (variant: "inverse" | "default") =>
+  const renderAddButton = (variant: "secondary" | "default") =>
     canEdit ? (
       <GitOpsModeTooltipWrapper
         renderChildren={(disableChildren) => (
           <Button
-            variant={variant === "inverse" ? "inverse" : undefined}
-            size={variant === "inverse" ? "small" : undefined}
+            variant={variant === "secondary" ? "secondary" : undefined}
+            size={variant === "secondary" ? "small" : undefined}
             onClick={onClickAdd}
             disabled={disableChildren}
           >
-            {variant === "inverse" && <Icon name="plus" />}
+            {variant === "secondary" && <Icon name="plus" />}
             <span>Add vital</span>
           </Button>
         )}
@@ -230,7 +230,7 @@ const CustomHostVitalsTab: React.FC<IVariablesCardProps> = ({
       <SectionHeader
         title="Custom host vitals"
         alignLeftHeaderVertically
-        details={renderAddButton("inverse")}
+        details={renderAddButton("secondary")}
       />
       <PageDescription
         variant="tab-panel"
diff --git a/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTableConfig.tsx b/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTableConfig.tsx
index 05e7ce7fd7..460cd7e99d 100644
--- a/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTableConfig.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/cards/CustomHostVitalsTab/CustomHostVitalsTableConfig.tsx
@@ -70,7 +70,7 @@ const generateTableHeaders = ({
         return (
           <div className="custom-host-vitals-tab__token">
             <TextCell value={token} />
-            <CopyButton copyText={token} variant="compact" />
+            <CopyButton copyText={token} variant="subdued" size="small" />
           </div>
         );
       },
@@ -104,20 +104,22 @@ const generateTableHeaders = ({
             renderChildren={(disableChildren) => (
               <div className="custom-host-vitals-tab__actions">
                 <Button
-                  variant="icon"
+                  variant="secondary"
+                  size="small"
                   disabled={disableChildren}
                   onClick={() => onEdit(vital)}
                   ariaLabel={`Edit ${vital.name}`}
                 >
-                  <Icon name="pencil" color="ui-fleet-black-75" />
+                  <Icon name="pencil" size="small" />
                 </Button>
                 <Button
-                  variant="icon"
+                  variant="secondary"
+                  size="small"
                   disabled={disableChildren}
                   onClick={() => onDelete(vital)}
                   ariaLabel={`Delete ${vital.name}`}
                 >
-                  <Icon name="trash" color="ui-fleet-black-75" />
+                  <Icon name="trash" size="small" />
                 </Button>
               </div>
             )}
diff --git a/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariables.tsx b/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariables.tsx
index 0ad97159a2..e17220b457 100644
--- a/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariables.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariables.tsx
@@ -189,7 +189,7 @@ const GlobalVariables = ({ router, location }: IGlobalVariablesProps) => {
             <GitOpsModeTooltipWrapper
               renderChildren={(disableChildren) => (
                 <Button
-                  variant="inverse"
+                  variant="secondary"
                   size="small"
                   onClick={onClickAddVariable}
                   disabled={disableChildren}
diff --git a/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariablesTableConfig.tsx b/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariablesTableConfig.tsx
index 0fad1f1011..9a8ca2d499 100644
--- a/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariablesTableConfig.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/cards/GlobalVariables/GlobalVariablesTableConfig.tsx
@@ -67,7 +67,7 @@ const generateTableHeaders = ({
         return (
           <div className="global-variables__token">
             <TextCell value={token} />
-            <CopyButton copyText={token} variant="compact" />
+            <CopyButton copyText={token} variant="subdued" size="small" />
           </div>
         );
       },
@@ -96,11 +96,12 @@ const generateTableHeaders = ({
         return (
           <div className="global-variables__actions">
             <Button
-              variant="icon"
+              variant="secondary"
+              size="small"
               onClick={() => onDelete(variable)}
               ariaLabel={`Delete ${variable.name}`}
             >
-              <Icon name="trash" color="ui-fleet-black-75" />
+              <Icon name="trash" size="small" />
             </Button>
           </div>
         );
diff --git a/frontend/pages/ManageControlsPage/Variables/components/AddCustomHostVitalModal/AddCustomHostVitalModal.tsx b/frontend/pages/ManageControlsPage/Variables/components/AddCustomHostVitalModal/AddCustomHostVitalModal.tsx
index afc303bf64..2ff7376bf9 100644
--- a/frontend/pages/ManageControlsPage/Variables/components/AddCustomHostVitalModal/AddCustomHostVitalModal.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/components/AddCustomHostVitalModal/AddCustomHostVitalModal.tsx
@@ -93,7 +93,7 @@ const AddCustomHostVitalModal = ({
           >
             Save
           </Button>
-          <Button variant="inverse" onClick={onCancel}>
+          <Button variant="secondary" onClick={onCancel}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/Variables/components/AddCustomVariableModal/AddCustomVariableModal.tsx b/frontend/pages/ManageControlsPage/Variables/components/AddCustomVariableModal/AddCustomVariableModal.tsx
index c3b19b8b0c..f83ed9150f 100644
--- a/frontend/pages/ManageControlsPage/Variables/components/AddCustomVariableModal/AddCustomVariableModal.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/components/AddCustomVariableModal/AddCustomVariableModal.tsx
@@ -136,7 +136,7 @@ const AddCustomVariableModal = ({
           >
             Save
           </Button>
-          <Button variant="inverse" onClick={onCancel}>
+          <Button variant="secondary" onClick={onCancel}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomHostVitalModal/DeleteCustomHostVitalModal.tsx b/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomHostVitalModal/DeleteCustomHostVitalModal.tsx
index 78d1e960fb..04cc80ac5e 100644
--- a/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomHostVitalModal/DeleteCustomHostVitalModal.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomHostVitalModal/DeleteCustomHostVitalModal.tsx
@@ -71,7 +71,7 @@ const DeleteCustomHostVitalModal = ({
         >
           Delete
         </Button>
-        <Button variant="inverse-alert" onClick={onExit}>
+        <Button variant="secondary" onClick={onExit}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomVariableModal/DeleteCustomVariableModal.tsx b/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomVariableModal/DeleteCustomVariableModal.tsx
index 1c405c34a5..942c2bd905 100644
--- a/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomVariableModal/DeleteCustomVariableModal.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/components/DeleteCustomVariableModal/DeleteCustomVariableModal.tsx
@@ -77,7 +77,7 @@ const DeleteCustomVariableModal = ({
         >
           Delete
         </Button>
-        <Button variant="inverse-alert" onClick={onExit}>
+        <Button variant="secondary" onClick={onExit}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/ManageControlsPage/Variables/components/EditCustomHostVitalModal/EditCustomHostVitalModal.tsx b/frontend/pages/ManageControlsPage/Variables/components/EditCustomHostVitalModal/EditCustomHostVitalModal.tsx
index c5a9833486..a7d9370d23 100644
--- a/frontend/pages/ManageControlsPage/Variables/components/EditCustomHostVitalModal/EditCustomHostVitalModal.tsx
+++ b/frontend/pages/ManageControlsPage/Variables/components/EditCustomHostVitalModal/EditCustomHostVitalModal.tsx
@@ -99,7 +99,7 @@ const EditCustomHostVitalModal = ({
           >
             Save
           </Button>
-          <Button variant="inverse" onClick={onCancel}>
+          <Button variant="secondary" onClick={onCancel}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/ManageControlsPage/components/UploadListHeading/UploadListHeading.tsx b/frontend/pages/ManageControlsPage/components/UploadListHeading/UploadListHeading.tsx
index 43093910d5..eae3160836 100644
--- a/frontend/pages/ManageControlsPage/components/UploadListHeading/UploadListHeading.tsx
+++ b/frontend/pages/ManageControlsPage/components/UploadListHeading/UploadListHeading.tsx
@@ -28,13 +28,13 @@ const UploadListHeading = ({
             renderChildren={(disableChildren) => (
               <Button
                 disabled={disableChildren}
-                variant="brand-inverse-icon"
+                variant="secondary"
+                size="small"
                 className={`${baseClass}__add-button`}
                 onClick={onClickAdd}
-                iconStroke
               >
                 <>
-                  <Icon name="plus" color="core-fleet-green" />
+                  <Icon name="plus" size="small" />
                   {createEntityText}
                 </>
               </Button>
diff --git a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsForm/FleetAppDetailsForm.tsx b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsForm/FleetAppDetailsForm.tsx
index 8fa28362ee..2a1aa7f3c6 100644
--- a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsForm/FleetAppDetailsForm.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsForm/FleetAppDetailsForm.tsx
@@ -136,7 +136,7 @@ const FleetAppDetailsForm = ({
             </TooltipWrapper>
           )}
         />
-        <Button onClick={onCancel} variant="inverse">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsModal/FleetAppDetailsModal.tsx b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsModal/FleetAppDetailsModal.tsx
index 70ec9d99cf..15c4571f42 100644
--- a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsModal/FleetAppDetailsModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetAppDetailsModal/FleetAppDetailsModal.tsx
@@ -83,7 +83,7 @@ const FleetAppDetailsModal = ({
             }
             value={
               <>
-                {slug} <CopyButton copyText={slug} variant="compact" />
+                {slug} <CopyButton copyText={slug} variant="subdued" />
               </>
             }
           />
diff --git a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetMaintainedAppDetailsPage.tsx b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetMaintainedAppDetailsPage.tsx
index fb65787c22..bf4815ccdc 100644
--- a/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetMaintainedAppDetailsPage.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareAddPage/SoftwareFleetMaintained/FleetMaintainedAppDetailsPage/FleetMaintainedAppDetailsPage.tsx
@@ -92,7 +92,7 @@ const FleetAppSummary = ({
         </div>
       </div>
       <div className={`${baseClass}__fleet-app-summary--show-details`}>
-        <Button variant="inverse" onClick={onClickShowAppDetails}>
+        <Button variant="subdued" onClick={onClickShowAppDetails}>
           <Icon name="info" /> Show details
         </Button>
       </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareInventory/SoftwareInventoryTable/SoftwareInventoryTable.tsx b/frontend/pages/SoftwarePage/SoftwareInventory/SoftwareInventoryTable/SoftwareInventoryTable.tsx
index 1156aaba7f..9105e0d87e 100644
--- a/frontend/pages/SoftwarePage/SoftwareInventory/SoftwareInventoryTable/SoftwareInventoryTable.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareInventory/SoftwareInventoryTable/SoftwareInventoryTable.tsx
@@ -253,7 +253,7 @@ const SoftwareTable = ({
           disableTooltip={!hasVulnFilters}
         >
           <Button
-            variant="inverse"
+            variant="secondary"
             onClick={onAddFiltersClick}
             disabled={controlsDisabled}
           >
diff --git a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/AddCategoryModal/AddCategoryModal.tsx b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/AddCategoryModal/AddCategoryModal.tsx
index f771beeef4..5cbf11adc5 100644
--- a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/AddCategoryModal/AddCategoryModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/AddCategoryModal/AddCategoryModal.tsx
@@ -80,7 +80,7 @@ const AddCategoryModal = ({
           <Button type="submit" disabled={isDisabled} isLoading={isSubmitting}>
             Add
           </Button>
-          <Button variant="inverse" onClick={onExit} disabled={isSubmitting}>
+          <Button variant="secondary" onClick={onExit} disabled={isSubmitting}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/DeleteCategoryModal/DeleteCategoryModal.tsx b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/DeleteCategoryModal/DeleteCategoryModal.tsx
index b835e2904d..749e4163e2 100644
--- a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/DeleteCategoryModal/DeleteCategoryModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/DeleteCategoryModal/DeleteCategoryModal.tsx
@@ -54,11 +54,7 @@ const DeleteCategoryModal = ({
           >
             Delete
           </Button>
-          <Button
-            variant="inverse-alert"
-            onClick={onExit}
-            disabled={isDeleting}
-          >
+          <Button variant="secondary" onClick={onExit} disabled={isDeleting}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/EditCategoryModal/EditCategoryModal.tsx b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/EditCategoryModal/EditCategoryModal.tsx
index bd23d6383a..110e0c9f11 100644
--- a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/EditCategoryModal/EditCategoryModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/EditCategoryModal/EditCategoryModal.tsx
@@ -81,7 +81,7 @@ const EditCategoryModal = ({
           <Button type="submit" disabled={isDisabled} isLoading={isSubmitting}>
             Save
           </Button>
-          <Button variant="inverse" onClick={onExit} disabled={isSubmitting}>
+          <Button variant="secondary" onClick={onExit} disabled={isSubmitting}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/SelfServiceCategoriesPage.tsx b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/SelfServiceCategoriesPage.tsx
index 5988624ad7..464fd50867 100644
--- a/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/SelfServiceCategoriesPage.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareLibrary/SelfServiceCategoriesPage/SelfServiceCategoriesPage.tsx
@@ -221,7 +221,7 @@ const SelfServiceCategoriesPage = ({
               Self-service categories
             </span>
             {canManage && (
-              <Button variant="inverse" onClick={() => setShowAddModal(true)}>
+              <Button variant="secondary" onClick={() => setShowAddModal(true)}>
                 <Icon name="plus" />
                 Add category
               </Button>
@@ -236,7 +236,7 @@ const SelfServiceCategoriesPage = ({
             {canManage && (
               <div className={`${baseClass}__row-actions`}>
                 <Button
-                  variant="icon"
+                  variant="subdued"
                   onClick={() => setCategoryToEdit(listItem)}
                   ariaLabel={`Edit ${listItem.name}`}
                   title="Edit"
@@ -244,7 +244,7 @@ const SelfServiceCategoriesPage = ({
                   <Icon name="pencil" />
                 </Button>
                 <Button
-                  variant="icon"
+                  variant="subdued"
                   onClick={() => setCategoryToDelete(listItem)}
                   ariaLabel={`Delete ${listItem.name}`}
                   title="Delete"
diff --git a/frontend/pages/SoftwarePage/SoftwareLibrary/SoftwareLibraryTable/SoftwareLibraryTable.tsx b/frontend/pages/SoftwarePage/SoftwareLibrary/SoftwareLibraryTable/SoftwareLibraryTable.tsx
index c0f0f320b3..1adb982d8e 100644
--- a/frontend/pages/SoftwarePage/SoftwareLibrary/SoftwareLibraryTable/SoftwareLibraryTable.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareLibrary/SoftwareLibraryTable/SoftwareLibraryTable.tsx
@@ -206,7 +206,7 @@ const SoftwareLibraryTable = ({
   const renderCustomControls = () => {
     return (
       <div className={`${baseClass}__controls`}>
-        <Button variant="inverse" onClick={onClickCategories}>
+        <Button variant="secondary" onClick={onClickCategories}>
           <Icon name="settings" /> Categories
         </Button>
         <Slider
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AddPatchPolicyModal/AddPatchPolicyModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AddPatchPolicyModal/AddPatchPolicyModal.tsx
index 2fc2a14995..047bf508c6 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AddPatchPolicyModal/AddPatchPolicyModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/AddPatchPolicyModal/AddPatchPolicyModal.tsx
@@ -79,7 +79,7 @@ const AddPatchPolicyModal = ({
               </Button>
             )}
           />
-          <Button variant="inverse" onClick={onExit}>
+          <Button variant="secondary" onClick={onExit}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx
index d6cb197976..1f4ce60735 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx
@@ -61,7 +61,7 @@ const ConfirmSaveChangesModal = ({
           >
             Save
           </Button>
-          <Button onClick={onClose} variant="inverse">
+          <Button onClick={onClose} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx
index 58e5bf3007..511efa2fb1 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/DeleteSoftwareModal/DeleteSoftwareModal.tsx
@@ -151,7 +151,7 @@ const DeleteSoftwareModal = ({
         >
           Delete
         </Button>
-        <Button variant="inverse-alert" onClick={onExit}>
+        <Button variant="secondary" onClick={onExit}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx
index a40bfd1290..55dfe7f86e 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditAutoUpdateConfigModal/EditAutoUpdateConfigModal.tsx
@@ -295,7 +295,7 @@ const EditAutoUpdateConfigModal = ({
       <ModalFooter
         primaryButtons={
           <>
-            <Button onClick={onExit} variant="inverse">
+            <Button onClick={onExit} variant="secondary">
               Cancel
             </Button>
             <GitOpsModeTooltipWrapper
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditConfigurationModal/EditConfigurationModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditConfigurationModal/EditConfigurationModal.tsx
index c9ff5f6022..ccddcb21fa 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditConfigurationModal/EditConfigurationModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditConfigurationModal/EditConfigurationModal.tsx
@@ -251,7 +251,7 @@ const EditConfigurationModal = ({
         <ModalFooter
           primaryButtons={
             <>
-              <Button onClick={onExit} variant="inverse">
+              <Button onClick={onExit} variant="secondary">
                 Cancel
               </Button>
               <Button
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditIconModal/EditIconModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditIconModal/EditIconModal.tsx
index ab71e8d6e2..12cdd574ff 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditIconModal/EditIconModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/EditIconModal/EditIconModal.tsx
@@ -607,7 +607,7 @@ const EditIconModal = ({
         message={UPLOAD_MESSAGE}
         onFileUpload={onFileSelect}
         buttonMessage="Choose file"
-        buttonType="brand-inverse-icon"
+        buttonType="secondary"
         className={`${baseClass}__file-uploader`}
         fileDetails={fileDetails}
         gitopsCompatible={false}
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/LibraryItemAccordion/LibraryItemAccordion.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/LibraryItemAccordion/LibraryItemAccordion.tsx
index 7fc3c5c341..a7fe257302 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/LibraryItemAccordion/LibraryItemAccordion.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/LibraryItemAccordion/LibraryItemAccordion.tsx
@@ -228,12 +228,12 @@ const LibraryItemAccordion = ({
     if (onBadgeClick) {
       return (
         <Button
-          variant="inverse"
+          variant="subdued"
           size="small"
           onClick={handleBadgeClick(onBadgeClick)}
           className={`${baseClass}__badge-button`}
         >
-          <Icon name={iconName} color="ui-fleet-black-75" />
+          <Icon name={iconName} />
           <span>{label}</span>
         </Button>
       );
@@ -242,7 +242,7 @@ const LibraryItemAccordion = ({
       <span
         className={`${baseClass}__badge-button ${baseClass}__badge-button--static`}
       >
-        <Icon name={iconName} color="ui-fleet-black-75" />
+        <Icon name={iconName} />
         <span>{label}</span>
       </span>
     );
@@ -276,15 +276,15 @@ const LibraryItemAccordion = ({
     >
       {onClick && canClick ? (
         <Button
-          variant="inverse"
+          variant="subdued"
           onClick={handleBadgeClick(onClick)}
           className={`${baseClass}__icon-button`}
           ariaLabel={ariaLabel}
         >
-          <Icon name={iconName} color="ui-fleet-black-75" />
+          <Icon name={iconName} />
         </Button>
       ) : (
-        <Icon name={iconName} color="ui-fleet-black-75" />
+        <Icon name={iconName} />
       )}
     </TooltipWrapper>
   );
@@ -350,19 +350,19 @@ const LibraryItemAccordion = ({
           >
             {canEditSoftware ? (
               <Button
-                variant="inverse"
+                variant="subdued"
                 size="small"
                 onClick={handleBadgeClick(onLabelCountClick)}
                 className={`${baseClass}__badge-button`}
               >
-                <Icon name="tag" color="ui-fleet-black-75" />
+                <Icon name="tag" />
                 <span>{labelCount}</span>
               </Button>
             ) : (
               <span
                 className={`${baseClass}__badge-button ${baseClass}__badge-button--static`}
               >
-                <Icon name="tag" color="ui-fleet-black-75" />
+                <Icon name="tag" />
                 <span>{labelCount}</span>
               </span>
             )}
@@ -371,19 +371,19 @@ const LibraryItemAccordion = ({
         {showAllHostsBadge &&
           (canEditSoftware ? (
             <Button
-              variant="inverse"
+              variant="subdued"
               size="small"
               onClick={handleBadgeClick(onLabelCountClick)}
               className={`${baseClass}__badge-button`}
             >
-              <Icon name="tag" color="ui-fleet-black-75" />
+              <Icon name="tag" />
               <span>{ALL_HOSTS_LABEL}</span>
             </Button>
           ) : (
             <span
               className={`${baseClass}__badge-button ${baseClass}__badge-button--static`}
             >
-              <Icon name="tag" color="ui-fleet-black-75" />
+              <Icon name="tag" />
               <span>{ALL_HOSTS_LABEL}</span>
             </span>
           ))}
@@ -564,6 +564,7 @@ const LibraryItemAccordion = ({
           />
           <CopyButton
             copyText={hashSha256}
+            variant="subdued"
             ariaLabel="Copy hash to clipboard"
           />
         </div>
@@ -573,7 +574,7 @@ const LibraryItemAccordion = ({
 
   const renderTrashButtonBody = (disabled: boolean) => (
     <Button
-      variant="icon"
+      variant="subdued"
       disabled={disabled}
       onClick={onTrashClick}
       ariaLabel="Delete this version"
@@ -728,7 +729,7 @@ const LibraryItemAccordion = ({
           <div className={`${baseClass}__actions-column`}>
             {canDownload && (
               <Button
-                variant="icon"
+                variant="subdued"
                 onClick={onDownloadClick}
                 ariaLabel="Download installer"
                 className={`${baseClass}__download-button`}
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx
index db0e726fdd..e9fccf2d74 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/SoftwareTitleDetailsPage.tsx
@@ -432,7 +432,7 @@ const SoftwareTitleDetailsPage = ({
     const atPackageLimit = packages.length >= MAX_PACKAGES_PER_TITLE;
     const addPackageButton = showAddPackageAction && (
       <Button
-        variant="inverse"
+        variant="secondary"
         onClick={() => setShowAddPackageModal(true)}
         disabled={atPackageLimit}
       >
diff --git a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/VersionsModal/VersionsModal.tsx b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/VersionsModal/VersionsModal.tsx
index 1bdbf80c69..1c6d2ba2bb 100644
--- a/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/VersionsModal/VersionsModal.tsx
+++ b/frontend/pages/SoftwarePage/SoftwareTitleDetailsPage/VersionsModal/VersionsModal.tsx
@@ -109,7 +109,7 @@ const VersionsModal = ({
         <ModalFooter
           primaryButtons={
             <>
-              <Button onClick={onExit} variant="inverse">
+              <Button onClick={onExit} variant="secondary">
                 Cancel
               </Button>
               <GitOpsModeTooltipWrapper
diff --git a/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tests.tsx b/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tests.tsx
index 5d7c7dfd0c..ab0adb335f 100644
--- a/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tests.tsx
+++ b/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tests.tsx
@@ -34,7 +34,7 @@ describe("buildActionOptions", () => {
       {
         label: "Edit appearance",
         value: ACTION_EDIT_APPEARANCE,
-        isDisabled: false,
+        disabled: false,
         tooltipContent: undefined,
       },
     ]);
@@ -61,7 +61,7 @@ describe("buildActionOptions", () => {
     expect(editSoftware).toEqual({
       label: "Edit software",
       value: ACTION_EDIT_SOFTWARE,
-      isDisabled: false,
+      disabled: false,
       tooltipContent: undefined,
     });
   });
@@ -87,7 +87,7 @@ describe("buildActionOptions", () => {
     expect(editConfig).toEqual({
       label: "Edit configuration",
       value: ACTION_EDIT_CONFIGURATION,
-      isDisabled: false,
+      disabled: false,
       tooltipContent: undefined,
     });
   });
@@ -116,18 +116,18 @@ describe("buildActionOptions", () => {
     );
 
     expect(editAppearance).toMatchObject({
-      isDisabled: true,
+      disabled: true,
       tooltipContent: expect.anything(),
     });
 
     expect(editConfig).toMatchObject({
-      isDisabled: true,
+      disabled: true,
       tooltipContent: expect.anything(),
     });
 
     // For Apple VPP, Edit software also gets the gitops tooltip if present.
     expect(editSoftware).toMatchObject({
-      isDisabled: true,
+      disabled: true,
       tooltipContent: expect.anything(),
     });
   });
@@ -149,7 +149,7 @@ describe("buildActionOptions", () => {
     expect(patch).toEqual({
       label: "Patch",
       value: ACTION_PATCH,
-      isDisabled: false,
+      disabled: false,
       tooltipContent: undefined,
     });
   });
@@ -171,7 +171,7 @@ describe("buildActionOptions", () => {
     expect(patch).toEqual({
       label: "Patch",
       value: ACTION_PATCH,
-      isDisabled: true,
+      disabled: true,
       tooltipContent: "Patch policy is already added.",
     });
   });
diff --git a/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tsx b/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tsx
index 951684796d..910276c4f7 100644
--- a/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tsx
+++ b/frontend/pages/SoftwarePage/components/cards/SoftwareDetailsSummary/SoftwareDetailsSummary.tsx
@@ -7,9 +7,7 @@ software/os/:id > Top section
 import React from "react";
 import classnames from "classnames";
 
-import { SingleValue } from "react-select-5";
-import { CustomOptionType } from "components/forms/fields/DropdownWrapper/DropdownWrapper";
-import { TooltipContent } from "interfaces/dropdownOption";
+import { IDropdownOption, TooltipContent } from "interfaces/dropdownOption";
 
 import { getPathWithQueryParams, QueryParams } from "utilities/url";
 import { getGitOpsModeTipContent } from "utilities/helpers";
@@ -26,7 +24,7 @@ import useGitOpsMode from "hooks/useGitOpsMode";
 import DataSet from "components/DataSet";
 import LastUpdatedHostCount from "components/LastUpdatedHostCount";
 import Button from "components/buttons/Button";
-import DropdownWrapper from "components/forms/fields/DropdownWrapper";
+import ActionsDropdown from "components/ActionsDropdown";
 import GitOpsModeTooltipWrapper from "components/GitOpsModeTooltipWrapper";
 import Icon from "components/Icon";
 import TooltipWrapper from "components/TooltipWrapper";
@@ -73,7 +71,7 @@ export const buildActionOptions = ({
   canManageVersions,
   canConfigureAutoUpdate,
   hasExistingPatchPolicy = false,
-}: BuildActionOptionsArgs): CustomOptionType[] => {
+}: BuildActionOptionsArgs): IDropdownOption[] => {
   let disableEditAppearanceTooltipContent: TooltipContent | undefined;
   let disableEditSoftwareTooltipContent: TooltipContent | undefined;
   let disabledPatchPolicyTooltipContent: TooltipContent | undefined;
@@ -99,11 +97,11 @@ export const buildActionOptions = ({
     disabledPatchPolicyTooltipContent = "Patch policy is already added.";
   }
 
-  const options: CustomOptionType[] = [
+  const options: IDropdownOption[] = [
     {
       label: "Edit appearance",
       value: ACTION_EDIT_APPEARANCE,
-      isDisabled: gitOpsModeEnabled,
+      disabled: gitOpsModeEnabled,
       tooltipContent: disableEditAppearanceTooltipContent,
     },
   ];
@@ -113,7 +111,7 @@ export const buildActionOptions = ({
     options.push({
       label: "Edit software",
       value: ACTION_EDIT_SOFTWARE,
-      isDisabled: !!gitOpsModeEnabled && isAppleVpp,
+      disabled: !!gitOpsModeEnabled && isAppleVpp,
       tooltipContent: disableEditSoftwareTooltipContent,
     });
   }
@@ -123,7 +121,7 @@ export const buildActionOptions = ({
     options.push({
       label: "Edit configuration",
       value: ACTION_EDIT_CONFIGURATION,
-      isDisabled: gitOpsModeEnabled,
+      disabled: gitOpsModeEnabled,
       tooltipContent: disabledEditConfigurationTooltipContent,
     });
   }
@@ -133,7 +131,7 @@ export const buildActionOptions = ({
     options.push({
       label: "Patch",
       value: ACTION_PATCH,
-      isDisabled: !!disabledPatchPolicyTooltipContent,
+      disabled: !!disabledPatchPolicyTooltipContent,
       tooltipContent: disabledPatchPolicyTooltipContent,
     });
   }
@@ -240,8 +238,8 @@ const SoftwareDetailsSummary = ({
   const { gitOpsModeEnabled, repoURL } = useGitOpsMode("software");
   const isRollingArch = ROLLING_ARCH_LINUX_VERSIONS.includes(displayName);
 
-  const onSelectSoftwareAction = (option: SingleValue<CustomOptionType>) => {
-    switch (option?.value) {
+  const onSelectSoftwareAction = (value: string) => {
+    switch (value) {
       case ACTION_EDIT_APPEARANCE:
         onClickEditAppearance && onClickEditAppearance();
         break;
@@ -346,7 +344,7 @@ const SoftwareDetailsSummary = ({
                   position="top"
                   renderChildren={(disableChildren) => (
                     <Button
-                      variant="inverse"
+                      variant="subdued"
                       onClick={onClickEditAppearance}
                       disabled={disableChildren || !onClickEditAppearance}
                     >
@@ -356,14 +354,13 @@ const SoftwareDetailsSummary = ({
                   )}
                 />
               ) : (
-                <DropdownWrapper
+                <ActionsDropdown
                   className={`${baseClass}__actions-dropdown`}
-                  name="software-actions"
                   onChange={onSelectSoftwareAction}
                   placeholder="Actions"
                   options={actionOptions}
-                  variant="button"
-                  nowrapMenu
+                  variant="secondary"
+                  menuAlign="right"
                 />
               )}
             </div>
diff --git a/frontend/pages/SoftwarePage/components/forms/AdvancedOptionsFields/AdvancedOptionsFields.tsx b/frontend/pages/SoftwarePage/components/forms/AdvancedOptionsFields/AdvancedOptionsFields.tsx
index 2b353db577..cd79db4c4c 100644
--- a/frontend/pages/SoftwarePage/components/forms/AdvancedOptionsFields/AdvancedOptionsFields.tsx
+++ b/frontend/pages/SoftwarePage/components/forms/AdvancedOptionsFields/AdvancedOptionsFields.tsx
@@ -64,7 +64,7 @@ const AdvancedOptionsFields = ({
     }
 
     return (
-      <Button variant="inverse" onClick={onClickShowSchema}>
+      <Button variant="subdued" onClick={onClickShowSchema}>
         Schema
         <Icon name="info" size="small" />
       </Button>
diff --git a/frontend/pages/SoftwarePage/components/forms/PackageAdvancedOptions/PackageAdvancedOptions.tsx b/frontend/pages/SoftwarePage/components/forms/PackageAdvancedOptions/PackageAdvancedOptions.tsx
index 3a0240ca92..47c2a42c62 100644
--- a/frontend/pages/SoftwarePage/components/forms/PackageAdvancedOptions/PackageAdvancedOptions.tsx
+++ b/frontend/pages/SoftwarePage/components/forms/PackageAdvancedOptions/PackageAdvancedOptions.tsx
@@ -285,6 +285,7 @@ const PackageAdvancedOptions = ({
         hideText="Advanced options"
         caretPosition="after"
         onClick={() => setShowAdvancedOptions(!showAdvancedOptions)}
+        variant="secondary"
         disabled={!selectedPackage || requiresAdvancedOptions}
         disabledTooltipContent={
           requiresAdvancedOptions ? (
diff --git a/frontend/pages/SoftwarePage/components/forms/PackageForm/PackageForm.tsx b/frontend/pages/SoftwarePage/components/forms/PackageForm/PackageForm.tsx
index b4a62aceac..5f5dd1cb44 100644
--- a/frontend/pages/SoftwarePage/components/forms/PackageForm/PackageForm.tsx
+++ b/frontend/pages/SoftwarePage/components/forms/PackageForm/PackageForm.tsx
@@ -471,7 +471,7 @@ const PackageForm = ({
           message={restrictedFileTypeLabel ?? renderFileTypeMessage()}
           onFileUpload={onFileSelect}
           buttonMessage="Choose file"
-          buttonType="brand-inverse-icon"
+          buttonType="secondary"
           className={`${baseClass}__file-uploader`}
           fileDetails={
             formData.software ? getFileDetails(formData.software) : undefined
@@ -555,7 +555,7 @@ const PackageForm = ({
             );
           })()}
 
-          <Button variant="inverse" onClick={onCancel}>
+          <Button variant="secondary" onClick={onCancel}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/components/forms/SoftwareAndroidForm/SoftwareAndroidForm.tsx b/frontend/pages/SoftwarePage/components/forms/SoftwareAndroidForm/SoftwareAndroidForm.tsx
index 6dd01590a2..3024dbe0f5 100644
--- a/frontend/pages/SoftwarePage/components/forms/SoftwareAndroidForm/SoftwareAndroidForm.tsx
+++ b/frontend/pages/SoftwarePage/components/forms/SoftwareAndroidForm/SoftwareAndroidForm.tsx
@@ -182,7 +182,7 @@ const SoftwareAndroidForm = ({
               </Button>
             )}
           />
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/components/forms/SoftwareOptionsSelector/SoftwareOptionsSelector.tsx b/frontend/pages/SoftwarePage/components/forms/SoftwareOptionsSelector/SoftwareOptionsSelector.tsx
index 137b7e487d..42e7ca975c 100644
--- a/frontend/pages/SoftwarePage/components/forms/SoftwareOptionsSelector/SoftwareOptionsSelector.tsx
+++ b/frontend/pages/SoftwarePage/components/forms/SoftwareOptionsSelector/SoftwareOptionsSelector.tsx
@@ -152,7 +152,7 @@ const CategoriesSelector = ({
       <div className="form-field__label">Categories</div>
       {renderList()}
       <Button
-        variant="inverse"
+        variant="secondary"
         onClick={onClickPreviewEndUserExperience}
         className={`${baseClass}__preview-button`}
       >
diff --git a/frontend/pages/SoftwarePage/components/forms/SoftwareVppForm/SoftwareVppForm.tsx b/frontend/pages/SoftwarePage/components/forms/SoftwareVppForm/SoftwareVppForm.tsx
index 3c2b418e69..0cb7c670a3 100644
--- a/frontend/pages/SoftwarePage/components/forms/SoftwareVppForm/SoftwareVppForm.tsx
+++ b/frontend/pages/SoftwarePage/components/forms/SoftwareVppForm/SoftwareVppForm.tsx
@@ -363,7 +363,7 @@ const SoftwareVppForm = ({
               </Button>
             )}
           />
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/components/modals/ManageSoftwareAutomationsModal/ManageSoftwareAutomationsModal.tsx b/frontend/pages/SoftwarePage/components/modals/ManageSoftwareAutomationsModal/ManageSoftwareAutomationsModal.tsx
index 6272c7d553..ee0ba79930 100644
--- a/frontend/pages/SoftwarePage/components/modals/ManageSoftwareAutomationsModal/ManageSoftwareAutomationsModal.tsx
+++ b/frontend/pages/SoftwarePage/components/modals/ManageSoftwareAutomationsModal/ManageSoftwareAutomationsModal.tsx
@@ -434,7 +434,7 @@ const ManageAutomationsModal = ({
         {!!selectedIntegration && (
           <Button
             type="button"
-            variant="inverse"
+            variant="secondary"
             onClick={togglePreviewTicketModal}
           >
             Preview ticket
@@ -481,7 +481,7 @@ const ManageAutomationsModal = ({
         />
         <Button
           type="button"
-          variant="inverse"
+          variant="secondary"
           onClick={togglePreviewPayloadModal}
         >
           Example payload
@@ -610,7 +610,7 @@ const ManageAutomationsModal = ({
         </div>
         <div className="modal-cta-wrap">
           {renderSaveButton()}
-          <Button onClick={onReturnToApp} variant="inverse">
+          <Button onClick={onReturnToApp} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/components/modals/SoftwareFiltersModal/SoftwareFiltersModal.tsx b/frontend/pages/SoftwarePage/components/modals/SoftwareFiltersModal/SoftwareFiltersModal.tsx
index 87d6a0e481..23452d36dc 100644
--- a/frontend/pages/SoftwarePage/components/modals/SoftwareFiltersModal/SoftwareFiltersModal.tsx
+++ b/frontend/pages/SoftwarePage/components/modals/SoftwareFiltersModal/SoftwareFiltersModal.tsx
@@ -279,7 +279,7 @@ const SoftwareFiltersModal = ({
               Apply
             </Button>
           </TooltipWrapper>
-          <Button variant="inverse" onClick={onExit}>
+          <Button variant="secondary" onClick={onExit}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/SoftwarePage/components/tables/HashCell/HashCell.tsx b/frontend/pages/SoftwarePage/components/tables/HashCell/HashCell.tsx
index 4e43d146c7..40de341b6f 100644
--- a/frontend/pages/SoftwarePage/components/tables/HashCell/HashCell.tsx
+++ b/frontend/pages/SoftwarePage/components/tables/HashCell/HashCell.tsx
@@ -24,7 +24,7 @@ const HashCell = ({
         <span className={`${baseClass}__sha256`}>
           {hash.slice(0, 7)}&hellip;{" "}
         </span>
-        <CopyButton copyText={hash} variant="compact" />
+        <CopyButton copyText={hash} variant="secondary" size="small" rowHover />
       </>
     );
   };
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListHeader/CertAuthorityListHeader.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListHeader/CertAuthorityListHeader.tsx
index a65eabee6b..479968b9d1 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListHeader/CertAuthorityListHeader.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListHeader/CertAuthorityListHeader.tsx
@@ -21,10 +21,9 @@ const CertAuthorityListHeader = ({
           renderChildren={(disableChildren) => (
             <Button
               disabled={disableChildren}
-              variant="inverse"
+              variant="secondary"
               className={`${baseClass}__add-button`}
               onClick={onClickAddCertAuthority}
-              iconStroke
             >
               <>
                 <Icon name="plus" />
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListItem/CertAuthorityListItem.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListItem/CertAuthorityListItem.tsx
index f8ae0d051b..481a2375f1 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListItem/CertAuthorityListItem.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CertAuthorityListItem/CertAuthorityListItem.tsx
@@ -23,7 +23,7 @@ const Actions = ({ onEdit, onDelete }: IActionsProps) => {
             disabled={disableChildren}
             onClick={onEdit}
             className={`${baseClass}__action-button`}
-            variant="icon"
+            variant="subdued"
           >
             <Icon name="pencil" />
           </Button>
@@ -36,7 +36,7 @@ const Actions = ({ onEdit, onDelete }: IActionsProps) => {
             disabled={disableChildren}
             onClick={onDelete}
             className={`${baseClass}__action-button`}
-            variant="icon"
+            variant="subdued"
           >
             <Icon name="trash" />
           </Button>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomESTForm/CustomESTForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomESTForm/CustomESTForm.tsx
index 1cca0d0e0a..126d13b2f8 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomESTForm/CustomESTForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomESTForm/CustomESTForm.tsx
@@ -108,7 +108,7 @@ const CustomESTForm = ({
             {submitBtnText}
           </Button>
         </TooltipWrapper>
-        <Button variant="inverse" onClick={onCancel}>
+        <Button variant="secondary" onClick={onCancel}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx
index c7fdeeb3c5..3e633906b9 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/CustomSCEPForm/CustomSCEPForm.tsx
@@ -115,7 +115,7 @@ const CustomSCEPForm = ({
             {submitBtnText}
           </Button>
         </TooltipWrapper>
-        <Button variant="inverse" onClick={onCancel}>
+        <Button variant="secondary" onClick={onCancel}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DeleteCertificateAuthorityModal/DeleteCertificateAuthorityModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DeleteCertificateAuthorityModal/DeleteCertificateAuthorityModal.tsx
index a6bf5ede61..20610163e7 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DeleteCertificateAuthorityModal/DeleteCertificateAuthorityModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DeleteCertificateAuthorityModal/DeleteCertificateAuthorityModal.tsx
@@ -58,7 +58,7 @@ const DeleteCertificateAuthorityModal = ({
         >
           Delete
         </Button>
-        <Button variant="inverse-alert" onClick={onExit}>
+        <Button variant="secondary" onClick={onExit}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx
index 58b3037ff7..d07a58decb 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/DigicertForm/DigicertForm.tsx
@@ -171,7 +171,7 @@ const DigicertForm = ({
             {submitBtnText}
           </Button>
         </TooltipWrapper>
-        <Button variant="inverse" onClick={onCancel}>
+        <Button variant="secondary" onClick={onCancel}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/HydrantForm/HydrantForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/HydrantForm/HydrantForm.tsx
index 805a1ab534..2ba37b5c2e 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/HydrantForm/HydrantForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/HydrantForm/HydrantForm.tsx
@@ -123,7 +123,7 @@ const HydrantForm = ({
             {submitBtnText}
           </Button>
         </TooltipWrapper>
-        <Button variant="inverse" onClick={onCancel}>
+        <Button variant="secondary" onClick={onCancel}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/NDESForm/NDESForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/NDESForm/NDESForm.tsx
index def1a44f17..a8a676dd6a 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/NDESForm/NDESForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/NDESForm/NDESForm.tsx
@@ -120,7 +120,7 @@ const NDESForm = ({
             {submitBtnText}
           </Button>
         </TooltipWrapper>
-        <Button variant="inverse" onClick={onCancel}>
+        <Button variant="secondary" onClick={onCancel}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/SmallstepForm/SmallstepForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/SmallstepForm/SmallstepForm.tsx
index 2da50b0977..07161b2f10 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/SmallstepForm/SmallstepForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/CertificateAuthorities/components/SmallstepForm/SmallstepForm.tsx
@@ -135,7 +135,7 @@ const SmallstepForm = ({
             {submitBtnText}
           </Button>
         </TooltipWrapper>
-        <Button variant="inverse" onClick={onCancel}>
+        <Button variant="secondary" onClick={onCancel}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
index 610178b22d..4ba3596bf9 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
@@ -142,7 +142,7 @@ const DeleteConditionalAccessModal = ({
         </Button>
         <Button
           onClick={toggleDeleteConditionalAccessModal}
-          variant="inverse-alert"
+          variant="secondary"
           disabled={isDeleting}
         >
           Cancel
@@ -369,7 +369,7 @@ const ConditionalAccess = () => {
         iconName={oktaConfigured ? "success" : undefined}
         cta={
           oktaConfigured ? (
-            <Button variant="text-icon" onClick={handleOktaDelete}>
+            <Button variant="subdued" onClick={handleOktaDelete}>
               Delete
               <Icon name="trash" color="ui-fleet-black-75" />
             </Button>
@@ -436,7 +436,7 @@ const ConditionalAccess = () => {
     let entraCta: React.JSX.Element | undefined;
     if (entraIsConfigured) {
       entraCta = (
-        <Button variant="text-icon" onClick={handleEntraDelete}>
+        <Button variant="subdued" onClick={handleEntraDelete}>
           Delete
           <Icon name="trash" color="ui-fleet-black-75" />
         </Button>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/EntraConditionalAccessModal/EntraConditionalAccessModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/EntraConditionalAccessModal/EntraConditionalAccessModal.tsx
index ac279316e3..1a2b6ebf03 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/EntraConditionalAccessModal/EntraConditionalAccessModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/EntraConditionalAccessModal/EntraConditionalAccessModal.tsx
@@ -118,7 +118,7 @@ const EntraConditionalAccessModal = ({
           >
             Save
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/OktaConditionalAccessModal/OktaConditionalAccessModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/OktaConditionalAccessModal/OktaConditionalAccessModal.tsx
index 1dc7e9fa37..9c84d48451 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/OktaConditionalAccessModal/OktaConditionalAccessModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/components/OktaConditionalAccessModal/OktaConditionalAccessModal.tsx
@@ -303,7 +303,7 @@ const OktaConditionalAccessModal = ({
           </TooltipWrapper>
           <br />
           <Button
-            variant="inverse"
+            variant="secondary"
             onClick={onDownloadSigningCert}
             isLoading={isDownloadingCert}
             disabled={isDownloadingCert}
@@ -366,7 +366,7 @@ const OktaConditionalAccessModal = ({
           }
           internalError={formErrors[OKTA_CERTIFICATE]}
           onFileUpload={onSelectFile}
-          buttonType="brand-inverse-icon"
+          buttonType="secondary"
           buttonMessage="Upload"
           accept=".pem,.crt,.cer,.cert"
           fileDetails={certFile ? { name: certFile.name } : undefined}
@@ -380,7 +380,7 @@ const OktaConditionalAccessModal = ({
           >
             Save
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/GlobalHostStatusWebhook/GlobalHostStatusWebhook.tsx b/frontend/pages/admin/IntegrationsPage/cards/GlobalHostStatusWebhook/GlobalHostStatusWebhook.tsx
index a479e2ff28..9bf25dc48e 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/GlobalHostStatusWebhook/GlobalHostStatusWebhook.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/GlobalHostStatusWebhook/GlobalHostStatusWebhook.tsx
@@ -167,7 +167,7 @@ const GlobalHostStatusWebhook = ({
             </p>
             <Button
               type="button"
-              variant="inverse"
+              variant="secondary"
               onClick={toggleHostStatusWebhookPreviewModal}
             >
               Preview request
diff --git a/frontend/pages/admin/IntegrationsPage/cards/Integrations/IntegrationsTableConfig.tsx b/frontend/pages/admin/IntegrationsPage/cards/Integrations/IntegrationsTableConfig.tsx
index 292880a4c4..23f810de3d 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/Integrations/IntegrationsTableConfig.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/Integrations/IntegrationsTableConfig.tsx
@@ -105,7 +105,7 @@ const generateTableHeaders = (
             actionSelectHandler(value, cellProps.row.original)
           }
           placeholder="Actions"
-          variant="small-button"
+          variant="secondary"
         />
       ),
     },
diff --git a/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/DeleteIntegrationModal/DeleteIntegrationModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/DeleteIntegrationModal/DeleteIntegrationModal.tsx
index 7fce0cb465..a45ecbe1f1 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/DeleteIntegrationModal/DeleteIntegrationModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/DeleteIntegrationModal/DeleteIntegrationModal.tsx
@@ -46,7 +46,7 @@ const DeleteIntegrationModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/IntegrationForm/IntegrationForm.tsx b/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/IntegrationForm/IntegrationForm.tsx
index 28616cf820..dc7eda612d 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/IntegrationForm/IntegrationForm.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/Integrations/components/IntegrationForm/IntegrationForm.tsx
@@ -303,7 +303,7 @@ const IntegrationForm = ({
                 );
               }}
             />
-            <Button onClick={onCancel} variant="inverse">
+            <Button onClick={onCancel} variant="secondary">
               Cancel
             </Button>
           </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AndroidMdmPage/components/TurnOffAndroidMdmModal/TurnOffAndroidMdmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AndroidMdmPage/components/TurnOffAndroidMdmModal/TurnOffAndroidMdmModal.tsx
index 47527d32da..ee879bdc50 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AndroidMdmPage/components/TurnOffAndroidMdmModal/TurnOffAndroidMdmModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AndroidMdmPage/components/TurnOffAndroidMdmModal/TurnOffAndroidMdmModal.tsx
@@ -79,7 +79,7 @@ const TurnOffAndroidMdmModal = ({
             </Button>
           )}
         />
-        <Button variant="inverse-alert" disabled={isDeleting} onClick={onExit}>
+        <Button variant="secondary" disabled={isDeleting} onClick={onExit}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx
index bda22396b1..83b7574ec0 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx
@@ -65,7 +65,7 @@ const AddAbmModal = ({ onCancel, onAdded }: IAddAbmModalProps) => {
         accept=".p7m"
         message="AB token (.p7m)"
         graphicName="file-p7m"
-        buttonType="brand-inverse-icon"
+        buttonType="secondary"
         buttonMessage={isUploading ? "Uploading..." : "Upload"}
         fileDetails={tokenFile ? { name: tokenFile.name } : undefined}
         onFileUpload={onSelectFile}
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx
index dd826f65f0..9807a54b17 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AppleBusinessManagerTable/AppleBusinessManagerTableConfig.tsx
@@ -240,7 +240,7 @@ export const generateTableConfig = (
             }
             placeholder="Actions"
             disabled={false}
-            variant="small-button"
+            variant="secondary"
           />
         </div>
       ),
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/DeleteAbmModal/DeleteAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/DeleteAbmModal/DeleteAbmModal.tsx
index c02a9320b3..9d53b3610c 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/DeleteAbmModal/DeleteAbmModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/DeleteAbmModal/DeleteAbmModal.tsx
@@ -65,11 +65,7 @@ const DeleteAbmModal = ({
         >
           Delete
         </Button>
-        <Button
-          onClick={onCancel}
-          disabled={isDeleting}
-          variant="inverse-alert"
-        >
+        <Button onClick={onCancel} disabled={isDeleting} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx
index 8ffaaa2d88..34ca636e02 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx
@@ -73,7 +73,7 @@ const RenewAbmModal = ({
           className={`${baseClass}__file-uploader`}
           accept=".p7m"
           buttonMessage="Choose file"
-          buttonType="brand-inverse-icon"
+          buttonType="secondary"
           graphicName="file-p7m"
           message="AB token (.p7m)"
           onFileUpload={onSelectFile}
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertInfo.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertInfo.tsx
index d030fe4317..faf065de5b 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertInfo.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertInfo.tsx
@@ -43,7 +43,7 @@ const ApplePushCertInfo = ({
         </div>
       </dl>
       <div className={`${baseClass}__apns-button-wrap`}>
-        <Button variant="inverse" onClick={onClickTurnOff}>
+        <Button variant="secondary" onClick={onClickTurnOff}>
           Turn off MDM
         </Button>
         <Button className="save-loading" onClick={onClickRenew}>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertSetup.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertSetup.tsx
index 836ab8861d..04d38416d6 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertSetup.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/content/ApplePushCertSetup.tsx
@@ -97,7 +97,7 @@ const ApplePushCertSetup = ({
         }`}
         accept=".pem"
         buttonMessage={isUploading ? "Uploading..." : "Upload"}
-        buttonType="brand-inverse-icon"
+        buttonType="secondary"
         disabled={isUploading}
         graphicName="file-pem"
         message="APNs certificate (.pem)"
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/RenewCertModal/RenewCertModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/RenewCertModal/RenewCertModal.tsx
index a0483b4470..6ff7bcf1c6 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/RenewCertModal/RenewCertModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/RenewCertModal/RenewCertModal.tsx
@@ -93,7 +93,7 @@ const RenewCertModal = ({
           className={`${baseClass}__file-uploader`}
           accept=".pem"
           buttonMessage="Choose file"
-          buttonType="brand-inverse-icon"
+          buttonType="secondary"
           graphicName="file-pem"
           message="APNs certificate (.pem)"
           onFileUpload={onSelectFile}
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/TurnOffAppleMdmModal/TurnOffAppleMdmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/TurnOffAppleMdmModal/TurnOffAppleMdmModal.tsx
index ea9c233f85..a9dc154f59 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/TurnOffAppleMdmModal/TurnOffAppleMdmModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleMdmPage/components/modals/TurnOffAppleMdmModal/TurnOffAppleMdmModal.tsx
@@ -54,11 +54,7 @@ const TurnOffAppleMdmModal = ({
           >
             Turn off
           </Button>
-          <Button
-            onClick={onCancel}
-            disabled={isDeleting}
-            variant="inverse-alert"
-          >
+          <Button onClick={onCancel} disabled={isDeleting} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/AddVppModal/AddVppModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/AddVppModal/AddVppModal.tsx
index e1c3445f67..79dec2ec73 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/AddVppModal/AddVppModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/AddVppModal/AddVppModal.tsx
@@ -70,7 +70,7 @@ const AddVppModal = ({ onCancel, onAdded }: IAddVppModalProps) => {
         accept=".vpptoken"
         message="Content token (.vpptoken)"
         graphicName="file-vpp"
-        buttonType="brand-inverse-icon"
+        buttonType="secondary"
         buttonMessage={isUploading ? "Uploading..." : "Upload"}
         fileDetails={tokenFile ? { name: tokenFile.name } : undefined}
         onFileUpload={onSelectFile}
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/DeleteVppModal/DeleteVppModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/DeleteVppModal/DeleteVppModal.tsx
index d97602591c..62671ccc11 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/DeleteVppModal/DeleteVppModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/DeleteVppModal/DeleteVppModal.tsx
@@ -64,11 +64,7 @@ const DeleteVppModal = ({
         >
           Delete
         </Button>
-        <Button
-          onClick={onCancel}
-          disabled={isDeleting}
-          variant="inverse-alert"
-        >
+        <Button onClick={onCancel} disabled={isDeleting} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/RenewVppModal/RenewVppModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/RenewVppModal/RenewVppModal.tsx
index 7829dc6d1d..d6384b619b 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/RenewVppModal/RenewVppModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/RenewVppModal/RenewVppModal.tsx
@@ -75,7 +75,7 @@ const RenewVppModal = ({
         accept=".vpptoken"
         message="Content token (.vpptoken)"
         graphicName="file-vpp"
-        buttonType="brand-inverse-icon"
+        buttonType="secondary"
         buttonMessage="Upload"
         fileDetails={tokenFile ? { name: tokenFile.name } : undefined}
         onFileUpload={onSelectFile}
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/VppTable/VppTableConfig.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/VppTable/VppTableConfig.tsx
index 6023011691..21ef97ee1c 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/VppTable/VppTableConfig.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/VppPage/components/VppTable/VppTableConfig.tsx
@@ -141,7 +141,7 @@ export const generateTableConfig = (
             actionSelectHandler(value, cellProps.row.original)
           }
           placeholder="Actions"
-          variant="small-button"
+          variant="secondary"
         />
       ),
     },
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListHeader/EntraClientIDsListHeader.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListHeader/EntraClientIDsListHeader.tsx
index 8cd298e019..beb658fbe0 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListHeader/EntraClientIDsListHeader.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListHeader/EntraClientIDsListHeader.tsx
@@ -22,10 +22,9 @@ const EntraClientIDsListHeader = ({
           renderChildren={(disableChildren) => (
             <Button
               disabled={disableChildren}
-              variant="inverse"
+              variant="secondary"
               className={`${baseClass}__add-button`}
               onClick={onClickAddClientId}
-              iconStroke
             >
               <>
                 <Icon name="plus" />
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListItem/EntraClientIDsListItem.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListItem/EntraClientIDsListItem.tsx
index f8cf905f79..627b0ddbff 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListItem/EntraClientIDsListItem.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraClientIDsListItem/EntraClientIDsListItem.tsx
@@ -28,7 +28,7 @@ const EntraClientIDsListItem = ({
               disabled={disableChildren}
               onClick={onClickDelete}
               className={`${baseClass}__action-button`}
-              variant="icon"
+              variant="subdued"
               ariaLabel={`Delete Microsoft Entra client ID ${clientId}`}
             >
               <Icon name="trash" />
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListHeader/EntraTenantsListHeader.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListHeader/EntraTenantsListHeader.tsx
index 22096b187d..86c7ad8e40 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListHeader/EntraTenantsListHeader.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListHeader/EntraTenantsListHeader.tsx
@@ -22,10 +22,9 @@ const EntraTenantsListHeader = ({
           renderChildren={(disableChildren) => (
             <Button
               disabled={disableChildren}
-              variant="inverse"
+              variant="secondary"
               className={`${baseClass}__add-button`}
               onClick={onClickAddTenant}
-              iconStroke
             >
               <>
                 <Icon name="plus" />
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListItem/EntraTenantsListItem.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListItem/EntraTenantsListItem.tsx
index 29e0da568e..d02cf1f015 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListItem/EntraTenantsListItem.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/WindowsAutomaticEnrollmentPage/EntraTenantsListItem/EntraTenantsListItem.tsx
@@ -28,7 +28,7 @@ const EntraTenantsListItem = ({
               disabled={disableChildren}
               onClick={onClickDelete}
               className={`${baseClass}__action-button`}
-              variant="icon"
+              variant="subdued"
               ariaLabel={`Delete Microsoft Entra tenant ${tenantId}`}
             >
               <Icon name="trash" />
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraClientIDModal/AddEntraClientIDModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraClientIDModal/AddEntraClientIDModal.tsx
index 02962c0113..cd022b82ee 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraClientIDModal/AddEntraClientIDModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraClientIDModal/AddEntraClientIDModal.tsx
@@ -120,7 +120,7 @@ const AddEntraClientIdModal = ({ onExit }: IAddEntraClientIdModalProps) => {
         >
           Add
         </Button>
-        <Button onClick={onExit} variant="inverse">
+        <Button onClick={onExit} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraTenantModal/AddEntraTenantModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraTenantModal/AddEntraTenantModal.tsx
index 0991a9bb93..c31e0fb821 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraTenantModal/AddEntraTenantModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AddEntraTenantModal/AddEntraTenantModal.tsx
@@ -116,7 +116,7 @@ const AddEntraTenantModal = ({ onExit }: IAddEntraTenantModalProps) => {
         >
           Add
         </Button>
-        <Button onClick={onExit} variant="inverse">
+        <Button onClick={onExit} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx
index 7834122c1e..61c4cb38a8 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/AppleAutomaticEnrollmentCard/AppleAutomaticEnrollmentCard.tsx
@@ -27,7 +27,7 @@ const AppleAutomaticEnrollmentCard = ({
     <SectionCard
       iconName="success"
       cta={
-        <Button onClick={viewDetails} variant="inverse">
+        <Button onClick={viewDetails} variant="subdued">
           <Icon name="pencil" />
           Edit
         </Button>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/VppCard/VppCard.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/VppCard/VppCard.tsx
index 9120d65457..c457b59775 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/VppCard/VppCard.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/AppleBusinessManagerSection/VppCard/VppCard.tsx
@@ -25,7 +25,7 @@ const VppCard = ({ isAppleMdmOn, isVppOn, viewDetails }: IVppCardProps) => {
     <SectionCard
       iconName="success"
       cta={
-        <Button onClick={viewDetails} variant="inverse">
+        <Button onClick={viewDetails} variant="subdued">
           <Icon name="pencil" />
           Edit
         </Button>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraClientIDModal/DeleteEntraClientIDModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraClientIDModal/DeleteEntraClientIDModal.tsx
index 3f2daf82a7..c49d3e1b31 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraClientIDModal/DeleteEntraClientIDModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraClientIDModal/DeleteEntraClientIDModal.tsx
@@ -66,7 +66,7 @@ const DeleteEntraClientIdModal = ({
         >
           Delete
         </Button>
-        <Button onClick={onExit} variant="inverse">
+        <Button onClick={onExit} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraTenantModal/DeleteEntraTenantModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraTenantModal/DeleteEntraTenantModal.tsx
index 8cfb22a8a1..6010d9f1e8 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraTenantModal/DeleteEntraTenantModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/DeleteEntraTenantModal/DeleteEntraTenantModal.tsx
@@ -62,7 +62,7 @@ const DeleteEntraTenantModal = ({
         <Button onClick={onDeleteToken} variant="alert" isLoading={isDeleting}>
           Delete
         </Button>
-        <Button onClick={onExit} variant="inverse">
+        <Button onClick={onExit} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx
index 8a2754bf3f..cd2e087ffc 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EndUserMigrationSection/EndUserMigrationSection.tsx
@@ -241,7 +241,7 @@ const EndUserMigrationSection = ({ router }: IEndUserMigrationSectionProps) => {
         </div>
         <Button
           className={`${baseClass}__preview-button`}
-          variant="inverse"
+          variant="secondary"
           onClick={toggleExamplePayloadModal}
         >
           Example payload
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/DeleteEulaModal/DeleteEulaModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/DeleteEulaModal/DeleteEulaModal.tsx
index 1c41df40d0..2c25d349c4 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/DeleteEulaModal/DeleteEulaModal.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/DeleteEulaModal/DeleteEulaModal.tsx
@@ -27,7 +27,7 @@ const DeleteEulaModal = ({ onDelete, onCancel }: IDeleteEulaModalProps) => {
           <Button type="button" onClick={() => onDelete()} variant="alert">
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/EulaListItem/EulaListItem.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/EulaListItem/EulaListItem.tsx
index 4c81504316..f1c94e6e47 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/EulaListItem/EulaListItem.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/EulaSection/components/EulaListItem/EulaListItem.tsx
@@ -42,7 +42,7 @@ const EulaListItem = ({ eulaData, onDelete }: IEulaListItemProps) => {
       >
         <Button
           className={`${baseClass}__list-item-button`}
-          variant="icon"
+          variant="subdued"
           onClick={onOpenEula}
         >
           <Icon
@@ -55,7 +55,7 @@ const EulaListItem = ({ eulaData, onDelete }: IEulaListItemProps) => {
           renderChildren={(disableChildren) => (
             <Button
               className={`${baseClass}__list-item-button`}
-              variant="icon"
+              variant="subdued"
               onClick={() => onDelete()}
               disabled={disableChildren}
             >
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AndroidMdmCard/AndroidMdmCard.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AndroidMdmCard/AndroidMdmCard.tsx
index cb349a1687..bed1377613 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AndroidMdmCard/AndroidMdmCard.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AndroidMdmCard/AndroidMdmCard.tsx
@@ -39,7 +39,7 @@ const TurnOffAndroidMdmCard = ({
       className={baseClass}
       iconName="success"
       cta={
-        <Button onClick={onClickEdit} variant="inverse">
+        <Button onClick={onClickEdit} variant="subdued">
           <Icon name="pencil" />
           Edit
         </Button>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AppleMdmCard/AppleMdmCard.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AppleMdmCard/AppleMdmCard.tsx
index beb1f75624..cb333af12d 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AppleMdmCard/AppleMdmCard.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/AppleMdmCard/AppleMdmCard.tsx
@@ -36,7 +36,7 @@ const SeeDetailsAppleMdmCard = ({
     <SectionCard
       iconName="success"
       cta={
-        <Button onClick={onClickDetails} variant="inverse">
+        <Button onClick={onClickDetails} variant="subdued">
           <Icon name="pencil" />
           Edit
         </Button>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/WindowsMdmCard/WindowsMdmCard.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/WindowsMdmCard/WindowsMdmCard.tsx
index 42d92ec926..846c7337a3 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/WindowsMdmCard/WindowsMdmCard.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MdmSettingsSection/WindowsMdmCard/WindowsMdmCard.tsx
@@ -37,7 +37,7 @@ const TurnOffWindowsMdmCard = ({
     <SectionCard
       iconName="success"
       cta={
-        <Button onClick={onClickEdit} variant="inverse">
+        <Button onClick={onClickEdit} variant="subdued">
           <Icon name="pencil" />
           Edit
         </Button>
diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MicrosoftEntraSection/WindowsAutomaticEnrollmentCard/WindowsEnrollmentCard.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MicrosoftEntraSection/WindowsAutomaticEnrollmentCard/WindowsEnrollmentCard.tsx
index 13e65a03de..f73ed9120a 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MicrosoftEntraSection/WindowsAutomaticEnrollmentCard/WindowsEnrollmentCard.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/components/MicrosoftEntraSection/WindowsAutomaticEnrollmentCard/WindowsEnrollmentCard.tsx
@@ -27,7 +27,7 @@ const WindowsTenantAddedCard = ({
   <SectionCard
     iconName="success"
     cta={
-      <Button onClick={editTenants} variant="inverse" iconStroke>
+      <Button onClick={editTenants} variant="subdued">
         <Icon name="pencil" />
         Edit
       </Button>
diff --git a/frontend/pages/admin/ManageFleetsPage/FleetTableConfig.tsx b/frontend/pages/admin/ManageFleetsPage/FleetTableConfig.tsx
index 729ac4ec2a..e3158fe53c 100644
--- a/frontend/pages/admin/ManageFleetsPage/FleetTableConfig.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/FleetTableConfig.tsx
@@ -110,7 +110,7 @@ const generateTableHeaders = (
                 }
                 placeholder="Actions"
                 disabled={disableChildren}
-                variant="small-button"
+                variant="secondary"
               />
             </div>
           )}
diff --git a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamDetailsWrapper.tsx b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamDetailsWrapper.tsx
index 7a26125a55..fe58613274 100644
--- a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamDetailsWrapper.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamDetailsWrapper.tsx
@@ -427,7 +427,7 @@ const TeamDetailsWrapper = ({
               {
                 type: "secondary",
                 label: "Manage enroll secrets",
-                buttonVariant: "inverse",
+                buttonVariant: "secondary",
                 iconName: "eye",
                 onClick: toggleManageEnrollSecretsModal,
                 gitOpsModeCompatible: true,
@@ -435,7 +435,7 @@ const TeamDetailsWrapper = ({
               {
                 type: "secondary",
                 label: "Rename fleet",
-                buttonVariant: "inverse",
+                buttonVariant: "secondary",
                 iconName: "pencil",
                 onClick: toggleRenameFleetModal,
                 gitOpsModeCompatible: true,
@@ -443,7 +443,7 @@ const TeamDetailsWrapper = ({
               {
                 type: "secondary",
                 label: "Delete fleet",
-                buttonVariant: "inverse",
+                buttonVariant: "secondary",
                 iconName: "trash",
                 hideAction: !isGlobalAdmin,
                 onClick: toggleDeleteFleetModal,
diff --git a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx
index 5cab59dfcb..a1166fb60f 100644
--- a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/TeamSettings.tsx
@@ -365,7 +365,7 @@ const TeamSettings = ({ location, router }: ITeamSubnavProps) => {
         </Checkbox>
         <Button
           type="button"
-          variant="inverse"
+          variant="secondary"
           onClick={toggleHostStatusWebhookPreviewModal}
         >
           Preview request
diff --git a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/components/TeamHostExpiryToggle/TeamHostExpiryToggle.tsx b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/components/TeamHostExpiryToggle/TeamHostExpiryToggle.tsx
index cd11ac80ad..75ad706c93 100644
--- a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/components/TeamHostExpiryToggle/TeamHostExpiryToggle.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/TeamSettings/components/TeamHostExpiryToggle/TeamHostExpiryToggle.tsx
@@ -34,9 +34,8 @@ const TeamHostExpiryToggle = ({
               setTeamExpiryEnabled(true);
             }}
             className={`${baseClass}__add-custom-window`}
-            variant="text-icon"
+            variant="subdued"
             size="small"
-            iconStroke
           >
             <>
               Add custom expiry window
diff --git a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPage.tsx b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPage.tsx
index 992feaf336..cda7319f6d 100644
--- a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPage.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPage.tsx
@@ -398,7 +398,9 @@ const UsersPage = ({ location, router }: ITeamSubnavProps): JSX.Element => {
           actionButton={{
             name: "add user",
             buttonText: isGlobalAdmin ? "Add users" : "Add user",
-            variant: "default",
+            variant: "secondary",
+            iconSvg: "plus",
+            iconPosition: "left",
             onClick: isGlobalAdmin ? toggleAddUserModal : toggleCreateUserModal,
             hideButton: userIds.length === 0 && searchString === "",
           }}
diff --git a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPageTableConfig.tsx b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPageTableConfig.tsx
index 5d50166065..66aab0d357 100644
--- a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPageTableConfig.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/UsersPageTableConfig.tsx
@@ -180,7 +180,7 @@ const generateColumnConfigs = (
             options={cellProps.cell.value}
             onChange={(value: string) => actionSelectHandler(value, rowUser)}
             placeholder="Actions"
-            variant="small-button"
+            variant="secondary"
             disabled={!canManageUser}
           />
         );
diff --git a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/AddUsersModal/AddUsersModal.tsx b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/AddUsersModal/AddUsersModal.tsx
index 62f8485dc2..0ffc4e4052 100644
--- a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/AddUsersModal/AddUsersModal.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/AddUsersModal/AddUsersModal.tsx
@@ -74,7 +74,7 @@ const AddUsersModal = ({
           >
             Add users
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/RemoveUserModal/RemoveUserModal.tsx b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/RemoveUserModal/RemoveUserModal.tsx
index 62fd798050..65a9030694 100644
--- a/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/RemoveUserModal/RemoveUserModal.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/TeamDetailsWrapper/UsersPage/components/RemoveUserModal/RemoveUserModal.tsx
@@ -45,7 +45,7 @@ const RemoveUserModal = ({
         >
           Remove
         </Button>
-        <Button onClick={onCancel} variant="inverse-alert">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/ManageFleetsPage/components/CreateFleetModal/CreateFleetModal.tsx b/frontend/pages/admin/ManageFleetsPage/components/CreateFleetModal/CreateFleetModal.tsx
index 87aa1225f5..3973a11f21 100644
--- a/frontend/pages/admin/ManageFleetsPage/components/CreateFleetModal/CreateFleetModal.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/components/CreateFleetModal/CreateFleetModal.tsx
@@ -77,7 +77,7 @@ const CreateFleetModal = ({
           >
             Create
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/ManageFleetsPage/components/DeleteFleetModal/DeleteFleetModal.tsx b/frontend/pages/admin/ManageFleetsPage/components/DeleteFleetModal/DeleteFleetModal.tsx
index 0da8c4a2bf..3cea399ae1 100644
--- a/frontend/pages/admin/ManageFleetsPage/components/DeleteFleetModal/DeleteFleetModal.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/components/DeleteFleetModal/DeleteFleetModal.tsx
@@ -43,7 +43,7 @@ const DeleteFleetModal = ({
         >
           Delete
         </Button>
-        <Button onClick={onCancel} variant="inverse-alert">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/admin/ManageFleetsPage/components/RenameFleetModal/RenameFleetModal.tsx b/frontend/pages/admin/ManageFleetsPage/components/RenameFleetModal/RenameFleetModal.tsx
index 882cda8505..6cff83c3ad 100644
--- a/frontend/pages/admin/ManageFleetsPage/components/RenameFleetModal/RenameFleetModal.tsx
+++ b/frontend/pages/admin/ManageFleetsPage/components/RenameFleetModal/RenameFleetModal.tsx
@@ -73,7 +73,7 @@ const RenameFleetModal = ({
           >
             Save
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/ManageUsersPage/_styles.scss b/frontend/pages/admin/ManageUsersPage/_styles.scss
index a0cfbc4585..fd7e1343de 100644
--- a/frontend/pages/admin/ManageUsersPage/_styles.scss
+++ b/frontend/pages/admin/ManageUsersPage/_styles.scss
@@ -108,7 +108,7 @@
     }
   }
 
-  // Override react-select container positioning so the brand-button
+  // Override react-select container positioning so the primary-variant
   // dropdown menu anchors to the wrapper instead of the collapsed control.
   // The .add-user-dropdown className is applied to the react-select container
   // element inside .actions-dropdown__wrapper.
@@ -124,7 +124,7 @@
 
   .add-user-dropdown {
     .actions-dropdown-select__menu {
-      margin-top: 4px !important; // Override inline 20px from brand-button variant
+      margin-top: 4px !important; // Override inline 20px from primary variant
     }
 
     .actions-dropdown__option {
diff --git a/frontend/pages/admin/ManageUsersPage/components/ApiEndpointSelectorTable/ApiEndpointSelectorTable.tsx b/frontend/pages/admin/ManageUsersPage/components/ApiEndpointSelectorTable/ApiEndpointSelectorTable.tsx
index fac1388a3c..d7b75fda82 100644
--- a/frontend/pages/admin/ManageUsersPage/components/ApiEndpointSelectorTable/ApiEndpointSelectorTable.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/ApiEndpointSelectorTable/ApiEndpointSelectorTable.tsx
@@ -122,7 +122,7 @@ const generateSelectedTableHeaders = (
     id: "delete",
     Header: "",
     Cell: (cellProps: { row: Row<IApiEndpointRow> }) => (
-      <Button onClick={() => handleRemove(cellProps.row)} variant="icon">
+      <Button onClick={() => handleRemove(cellProps.row)} variant="subdued">
         <Icon name="close-filled" />
       </Button>
     ),
diff --git a/frontend/pages/admin/ManageUsersPage/components/ApiUserForm/ApiUserForm.tsx b/frontend/pages/admin/ManageUsersPage/components/ApiUserForm/ApiUserForm.tsx
index 0c350f0cc6..1afae77121 100644
--- a/frontend/pages/admin/ManageUsersPage/components/ApiUserForm/ApiUserForm.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/ApiUserForm/ApiUserForm.tsx
@@ -255,7 +255,7 @@ const ApiUserForm = ({
             />
           )}
           <div className="user-management-form__footer">
-            <Button onClick={onCancel} variant="inverse">
+            <Button onClick={onCancel} variant="secondary">
               Cancel
             </Button>
             <Button
diff --git a/frontend/pages/admin/ManageUsersPage/components/DeleteUserModal/DeleteUserModal.tsx b/frontend/pages/admin/ManageUsersPage/components/DeleteUserModal/DeleteUserModal.tsx
index 8193a3b708..a9edf3ed0c 100644
--- a/frontend/pages/admin/ManageUsersPage/components/DeleteUserModal/DeleteUserModal.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/DeleteUserModal/DeleteUserModal.tsx
@@ -35,7 +35,7 @@ const DeleteUserModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/ManageUsersPage/components/ResetPasswordModal/ResetPasswordModal.tsx b/frontend/pages/admin/ManageUsersPage/components/ResetPasswordModal/ResetPasswordModal.tsx
index 496690db4c..320c05139a 100644
--- a/frontend/pages/admin/ManageUsersPage/components/ResetPasswordModal/ResetPasswordModal.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/ResetPasswordModal/ResetPasswordModal.tsx
@@ -30,7 +30,7 @@ const ResetPasswordModal = ({
           <Button type="button" onClick={onResetConfirm}>
             Confirm
           </Button>
-          <Button onClick={onResetCancel} variant="inverse">
+          <Button onClick={onResetCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/ManageUsersPage/components/ResetSessionsModal/ResetSessionsModal.tsx b/frontend/pages/admin/ManageUsersPage/components/ResetSessionsModal/ResetSessionsModal.tsx
index 2db7dd9a68..5da5562ae4 100644
--- a/frontend/pages/admin/ManageUsersPage/components/ResetSessionsModal/ResetSessionsModal.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/ResetSessionsModal/ResetSessionsModal.tsx
@@ -29,7 +29,7 @@ const ResetSessionsModal = ({
           <Button type="button" onClick={onResetConfirm}>
             Confirm
           </Button>
-          <Button onClick={onResetCancel} variant="inverse">
+          <Button onClick={onResetCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/admin/ManageUsersPage/components/UserForm/UserForm.tsx b/frontend/pages/admin/ManageUsersPage/components/UserForm/UserForm.tsx
index 6a00f1888e..2cb06406d9 100644
--- a/frontend/pages/admin/ManageUsersPage/components/UserForm/UserForm.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/UserForm/UserForm.tsx
@@ -738,7 +738,7 @@ const UserForm = ({
     <ModalFooter
       primaryButtons={
         <>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
           <Button
diff --git a/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx b/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx
index a8b698412c..03028d3798 100644
--- a/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTable.tsx
@@ -317,7 +317,7 @@ const UsersTable = ({ router }: IUsersTableProps): JSX.Element => {
         options={ADD_USER_OPTIONS}
         onChange={onAddUserSelect}
         placeholder="Add user"
-        variant="brand-button"
+        variant="primary"
         buttonLabel="Add user"
         className="add-user-dropdown"
         menuAlign="left"
diff --git a/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTableConfig.tsx b/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTableConfig.tsx
index 5400d06be8..8c1fa430fe 100644
--- a/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTableConfig.tsx
+++ b/frontend/pages/admin/ManageUsersPage/components/UsersTable/UsersTableConfig.tsx
@@ -218,7 +218,7 @@ const generateTableHeaders = (
           }
           placeholder="Actions"
           menuAlign="right"
-          variant="small-button"
+          variant="secondary"
         />
       ),
     },
diff --git a/frontend/pages/admin/OrgSettingsPage/cards/Info/Info.tsx b/frontend/pages/admin/OrgSettingsPage/cards/Info/Info.tsx
index 96e41895e9..41e99d0ebd 100644
--- a/frontend/pages/admin/OrgSettingsPage/cards/Info/Info.tsx
+++ b/frontend/pages/admin/OrgSettingsPage/cards/Info/Info.tsx
@@ -86,12 +86,12 @@ const LogoCard = ({
             tipOffset={4}
             renderChildren={(disableChildren) => (
               <Button
-                variant="icon"
+                variant="subdued"
                 onClick={onEdit}
                 disabled={disableChildren}
                 title="Replace logo"
               >
-                <Icon name="pencil" color="core-fleet-green" />
+                <Icon name="pencil" />
               </Button>
             )}
           />
@@ -100,12 +100,12 @@ const LogoCard = ({
             tipOffset={4}
             renderChildren={(disableChildren) => (
               <Button
-                variant="icon"
+                variant="subdued"
                 onClick={onDelete}
                 disabled={disableChildren || !hasCustomLogo}
                 title="Remove logo"
               >
-                <Icon name="trash" color="core-fleet-green" />
+                <Icon name="trash" />
               </Button>
             )}
           />
diff --git a/frontend/pages/admin/components/DownloadFileButtons/DownloadABMKey.tsx b/frontend/pages/admin/components/DownloadFileButtons/DownloadABMKey.tsx
index a4db97a7b5..a2efa93143 100644
--- a/frontend/pages/admin/components/DownloadFileButtons/DownloadABMKey.tsx
+++ b/frontend/pages/admin/components/DownloadFileButtons/DownloadABMKey.tsx
@@ -66,11 +66,11 @@ export const DownloadABMKey = ({
   return (
     <Button
       className={`${baseClass}__request-button`}
-      variant="inverse"
+      variant="secondary"
       onClick={handleDownload}
     >
       <label htmlFor="download-key">
-        <Icon name="download" color="ui-fleet-black-75" size="medium" />
+        <Icon name="download" size="medium" />
         <span>Download public key</span>
       </label>
     </Button>
diff --git a/frontend/pages/admin/components/DownloadFileButtons/DownloadCSR.tsx b/frontend/pages/admin/components/DownloadFileButtons/DownloadCSR.tsx
index 7ba466448f..1532f0b474 100644
--- a/frontend/pages/admin/components/DownloadFileButtons/DownloadCSR.tsx
+++ b/frontend/pages/admin/components/DownloadFileButtons/DownloadCSR.tsx
@@ -62,11 +62,11 @@ export const DownloadCSR = ({
   return (
     <Button
       className={`${baseClass}__request-button`}
-      variant="inverse"
+      variant="secondary"
       onClick={handleDownload}
     >
       <label htmlFor="request-csr">
-        <Icon name="download" color="core-fleet-black" size="medium" />
+        <Icon name="download" size="medium" />
         <span>Download CSR</span>
       </label>
     </Button>
diff --git a/frontend/pages/errors/Fleet404/Fleet404.tsx b/frontend/pages/errors/Fleet404/Fleet404.tsx
index 88dd7e75c3..2975fb7fb4 100644
--- a/frontend/pages/errors/Fleet404/Fleet404.tsx
+++ b/frontend/pages/errors/Fleet404/Fleet404.tsx
@@ -20,7 +20,7 @@ const Fleet404 = () => (
         The page you are looking for has either moved, or doesn&apos;t exist.
       </p>
       <Button
-        variant="inverse"
+        variant="secondary"
         onClick={() =>
           window.open(SUPPORT_LINK, "_blank", "noopener,noreferrer")
         }
diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
index bf2527afa4..acf379530a 100644
--- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
@@ -1765,26 +1765,9 @@ const ManageHostsPage = ({
   // No hosts enrolled at all, no filters active
   const isTrulyEmpty = maybeEmptyHosts && !includesFilterQueryParam;
 
-  const renderHostCountAndExport = useCallback(() => {
-    return (
-      <>
-        <TableCount name="hosts" count={totalFilteredHostsCount} />
-        {(!!totalFilteredHostsCount || isTrulyEmpty) && (
-          <Button
-            className={`${baseClass}__export-btn`}
-            onClick={onExportHostsResults}
-            variant="inverse"
-            disabled={isTrulyEmpty}
-          >
-            <>
-              Export hosts
-              <Icon name="download" size="small" />
-            </>
-          </Button>
-        )}
-      </>
-    );
-  }, [totalFilteredHostsCount, isTrulyEmpty, onExportHostsResults]);
+  const renderHostCount = useCallback(() => {
+    return <TableCount name="hosts" count={totalFilteredHostsCount} />;
+  }, [totalFilteredHostsCount]);
 
   const renderCustomControls = () => {
     // we filter out the status labels as we dont want to display them in the label
@@ -1796,27 +1779,55 @@ const ManageHostsPage = ({
         : undefined;
 
     return (
-      <div className={`${baseClass}__filter-dropdowns`}>
-        <DropdownWrapper
-          name="status-filter"
-          value={status || mdmEnrollmentStatus || ""}
-          className={`${baseClass}__status-filter`}
-          options={hostSelectStatuses(isPremiumTier || false)}
-          onChange={handleStatusDropdownChange}
-          variant="table-filter"
-          isDisabled={isTrulyEmpty}
-        />
-        <LabelFilterSelect
-          className={`${baseClass}__label-filter-dropdown`}
-          labels={labels ?? []}
-          canAddNewLabels={canAddNewLabels}
-          selectedLabel={selectedDropdownLabel ?? null}
-          onChange={handleLabelChange}
-          onAddLabel={onAddLabelClick}
-          isLoading={isLoadingLabels}
-          isDisabled={isTrulyEmpty}
-        />
-      </div>
+      <>
+        <div className={`${baseClass}__table-actions`}>
+          {(!!totalFilteredHostsCount || isTrulyEmpty) && (
+            <Button
+              className={`${baseClass}__export-btn`}
+              onClick={onExportHostsResults}
+              variant="secondary"
+              disabled={isTrulyEmpty}
+            >
+              <>
+                <Icon name="download" size="small" />
+                Export hosts
+              </>
+            </Button>
+          )}
+          <Button
+            className={`${baseClass}__edit-columns-btn`}
+            onClick={toggleEditColumnsModal}
+            variant="secondary"
+            disabled={isTrulyEmpty}
+          >
+            <>
+              <Icon name="columns" color="ui-fleet-black-75" />
+              Edit columns
+            </>
+          </Button>
+        </div>
+        <div className={`${baseClass}__filter-dropdowns`}>
+          <DropdownWrapper
+            name="status-filter"
+            value={status || mdmEnrollmentStatus || ""}
+            className={`${baseClass}__status-filter`}
+            options={hostSelectStatuses(isPremiumTier || false)}
+            onChange={handleStatusDropdownChange}
+            variant="table-filter"
+            isDisabled={isTrulyEmpty}
+          />
+          <LabelFilterSelect
+            className={`${baseClass}__label-filter-dropdown`}
+            labels={labels ?? []}
+            canAddNewLabels={canAddNewLabels}
+            selectedLabel={selectedDropdownLabel ?? null}
+            onChange={handleLabelChange}
+            onAddLabel={onAddLabelClick}
+            isLoading={isLoadingLabels}
+            isDisabled={isTrulyEmpty}
+          />
+        </div>
+      </>
     );
   };
 
@@ -1865,9 +1876,8 @@ const ManageHostsPage = ({
         name: "run-script",
         onClick: onClickRunScriptBatchAction,
         buttonText: "Run script",
-        variant: "inverse",
+        variant: "secondary",
         iconSvg: "run",
-        iconStroke: true,
         hideButton: !canRunScriptBatch,
         isDisabled: !!disableRunScriptBatchTooltipContent,
         tooltipContent: disableRunScriptBatchTooltipContent,
@@ -1876,7 +1886,7 @@ const ManageHostsPage = ({
         name: "transfer",
         onClick: onTransferToTeamClick,
         buttonText: "Transfer",
-        variant: "inverse",
+        variant: "secondary",
         iconSvg: "transfer",
         hideButton:
           !isPremiumTier ||
@@ -1981,13 +1991,6 @@ const ManageHostsPage = ({
         pageSize={DEFAULT_PAGE_SIZE}
         additionalQueries={JSON.stringify(selectedLabels)}
         inputPlaceHolder={HOSTS_SEARCH_BOX_PLACEHOLDER}
-        actionButton={{
-          name: "edit columns",
-          buttonText: "Edit columns",
-          iconSvg: "columns",
-          variant: "inverse",
-          onClick: toggleEditColumnsModal,
-        }}
         primarySelectAction={
           // Global technicians cannot delete hosts, so hide the bulk Delete
           // action while still allowing them to select hosts for transfer.
@@ -1997,7 +2000,7 @@ const ManageHostsPage = ({
                 name: "delete host",
                 buttonText: "Delete",
                 iconSvg: "trash",
-                variant: "inverse",
+                variant: "secondary",
                 onClick: onDeleteHostsClick,
               }
         }
@@ -2007,9 +2010,8 @@ const ManageHostsPage = ({
         totalCount={totalFilteredHostsCount}
         searchable
         disableSearch={isTrulyEmpty}
-        renderCount={renderHostCountAndExport}
+        renderCount={renderHostCount}
         searchToolTipText={HOSTS_SEARCH_BOX_TOOLTIP}
-        disableActionButton={isTrulyEmpty}
         emptyComponent={() => (
           <EmptyState
             header={emptyState().header}
@@ -2079,7 +2081,7 @@ const ManageHostsPage = ({
                   )
                 }
                 className={`${baseClass}__custom-host-vitals`}
-                variant="inverse"
+                variant="secondary"
               >
                 <Icon name="pencil" />
                 <span>Custom host vitals</span>
@@ -2089,7 +2091,7 @@ const ManageHostsPage = ({
               <Button
                 onClick={() => setShowEnrollSecretModal(true)}
                 className={`${baseClass}__enroll-hosts button`}
-                variant="inverse"
+                variant="secondary"
               >
                 <Icon name="settings" />
                 <span>Enroll secrets</span>
diff --git a/frontend/pages/hosts/ManageHostsPage/_styles.scss b/frontend/pages/hosts/ManageHostsPage/_styles.scss
index 38f3c3d3c8..fa50d2cdab 100644
--- a/frontend/pages/hosts/ManageHostsPage/_styles.scss
+++ b/frontend/pages/hosts/ManageHostsPage/_styles.scss
@@ -101,6 +101,12 @@
         display: flex;
         align-items: center;
 
+        .manage-hosts__table-actions {
+          display: flex;
+          align-items: center;
+          gap: $pad-medium; // grouping secondary buttons
+        }
+
         .manage-hosts__filter-dropdowns {
           display: flex;
           flex-direction: row;
diff --git a/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/CustomLabelGroupHeading.tsx b/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/CustomLabelGroupHeading.tsx
index 3ab9051da4..2b961dc4dc 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/CustomLabelGroupHeading.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/CustomLabelGroupHeading.tsx
@@ -45,21 +45,6 @@ const CustomLabelGroupHeading = (
     <components.GroupHeading {...props}>
       <div className={`${baseClass}__labels-header`}>
         <span className={`${baseClass}__label-title`}>{props.children}</span>
-        <div className={`${baseClass}__add_new_label`}>
-          {canAddNewLabels && (
-            <Button
-              variant="brand-inverse-icon"
-              onClick={onAddLabel}
-              iconStroke
-              size="small"
-            >
-              <>
-                Add label
-                <Icon name="plus" color="core-fleet-green" />
-              </>
-            </Button>
-          )}
-        </div>
       </div>
       <div className={`${baseClass}__field`}>
         <input
@@ -78,6 +63,15 @@ const CustomLabelGroupHeading = (
           onBlur={onBlurLabelSearchInput}
         />
         <Icon name="search" />
+        {canAddNewLabels && (
+          <Button
+            className={`${baseClass}__add-label-button`}
+            variant="secondary"
+            onClick={onAddLabel}
+          >
+            <Icon name="plus" />
+          </Button>
+        )}
       </div>
     </components.GroupHeading>
   );
diff --git a/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/_styles.scss b/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/_styles.scss
index 678f196058..55e6903044 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/_styles.scss
+++ b/frontend/pages/hosts/ManageHostsPage/components/CustomLabelGroupHeading/_styles.scss
@@ -15,8 +15,16 @@
 
   &__field {
     position: relative;
+    display: flex;
+    align-items: center;
+    gap: $pad-medium;
+    margin-bottom: $pad-medium;
 
-    .icon {
+    // Scoped to a direct child so this doesn't also catch the plus icon
+    // nested inside the "Add label" button below, which needs to stay
+    // centered in its own flex layout instead of being pulled out via
+    // absolute positioning.
+    > .icon {
       position: absolute;
       left: 12px;
       top: 0;
@@ -27,8 +35,13 @@
     }
   }
 
+  &__add-label-button {
+    flex-shrink: 0;
+  }
+
   &__input {
-    width: 100%;
+    flex: 1;
+    min-width: 0;
     line-height: $line-height;
     background-color: $core-fleet-white;
     border: solid 1px $ui-fleet-black-10;
@@ -41,8 +54,6 @@
     box-sizing: border-box;
     height: 36px;
 
-    margin-bottom: $pad-medium;
-
     &::placeholder {
       color: $ui-fleet-black-50;
     }
diff --git a/frontend/pages/hosts/ManageHostsPage/components/DeleteLabelModal/DeleteLabelModal.tsx b/frontend/pages/hosts/ManageHostsPage/components/DeleteLabelModal/DeleteLabelModal.tsx
index 83aaf2a97c..721d98a2bf 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/DeleteLabelModal/DeleteLabelModal.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/components/DeleteLabelModal/DeleteLabelModal.tsx
@@ -48,7 +48,7 @@ const DeleteLabelModal = ({
         >
           Delete
         </Button>
-        <Button onClick={onCancel} variant="inverse-alert">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/hosts/ManageHostsPage/components/EditColumnsModal/EditColumnsModal.jsx b/frontend/pages/hosts/ManageHostsPage/components/EditColumnsModal/EditColumnsModal.jsx
index e796946103..89ce078642 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/EditColumnsModal/EditColumnsModal.jsx
+++ b/frontend/pages/hosts/ManageHostsPage/components/EditColumnsModal/EditColumnsModal.jsx
@@ -81,7 +81,7 @@ const EditColumnsModal = ({
           <Button onClick={() => onSaveColumns(getHiddenColumns(columnItems))}>
             Save
           </Button>
-          <Button onClick={onCancelColumns} variant="inverse">
+          <Button onClick={onCancelColumns} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/hosts/ManageHostsPage/components/FilterPill/FilterPill.tsx b/frontend/pages/hosts/ManageHostsPage/components/FilterPill/FilterPill.tsx
index 0d848f61b2..8a4cc7a577 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/FilterPill/FilterPill.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/components/FilterPill/FilterPill.tsx
@@ -71,7 +71,7 @@ const FilterPill = ({
             <Button
               className={`${baseClass}__clear-filter`}
               onClick={onClear}
-              variant="icon"
+              variant="subdued"
               title={label}
             >
               <Icon name="close" color="core-fleet-black" size="small" />
diff --git a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx
index 0ba938c796..3791402074 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/HostsFilterBlock.tsx
@@ -230,7 +230,8 @@ const HostsFilterBlock = ({
                         <Button
                           className={`${baseClass}__action-btn`}
                           onClick={onClickEditLabel}
-                          variant="icon"
+                          variant="secondary"
+                          size="small"
                           disabled={disableChildren}
                         >
                           <Icon name="pencil" size="small" />
@@ -240,7 +241,8 @@ const HostsFilterBlock = ({
                     <Button
                       className={`${baseClass}__action-btn`}
                       onClick={onClickDeleteLabel}
-                      variant="icon"
+                      variant="secondary"
+                      size="small"
                       disabled={disableChildren}
                     >
                       <Icon name="trash" size="small" />
diff --git a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/_styles.scss b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/_styles.scss
index 02daa86d0f..a4f57147c4 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/_styles.scss
+++ b/frontend/pages/hosts/ManageHostsPage/components/HostsFilterBlock/_styles.scss
@@ -15,12 +15,6 @@
       display: flex;
       align-items: center;
     }
-
-    &__action-btn {
-      svg {
-        padding: $pad-small;
-      }
-    }
   }
 
   &__os_settings-dropdown,
diff --git a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss
index d57f3731a3..36bc320f4c 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss
+++ b/frontend/pages/hosts/ManageHostsPage/components/LabelFilterSelect/_styles.scss
@@ -25,6 +25,9 @@
     background-color: $core-fleet-white;
     border-radius: $border-radius;
     height: 36px;
+    // react-select-5 bakes in a 38px minHeight via its own emotion styles,
+    // which otherwise wins over the height above
+    min-height: 36px !important;
 
     body.dark-mode & {
       background-color: $ui-fleet-black-5;
@@ -113,7 +116,7 @@
 
   .label-filter-select__menu-list {
     max-height: 574px;
-    padding: $pad-small $pad-medium;
+    padding: $pad-medium;
   }
 
   .label-filter-select__option {
diff --git a/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchModal/RunScriptBatchModal.tsx b/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchModal/RunScriptBatchModal.tsx
index 8109a5916d..bfc7a492fc 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchModal/RunScriptBatchModal.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchModal/RunScriptBatchModal.tsx
@@ -370,7 +370,7 @@ const RunScriptBatchModal = ({
             </TooltipWrapper>
             <Button
               disabled={isUpdating}
-              variant="inverse"
+              variant="secondary"
               onClick={() => {
                 setSelectedScript(undefined);
               }}
@@ -398,7 +398,7 @@ const RunScriptBatchModal = ({
               </Button>
               <Button
                 onClick={() => setScriptForDetails(undefined)}
-                variant="inverse"
+                variant="subdued"
               >
                 Go back
               </Button>
diff --git a/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchPaginatedList/RunScriptBatchPaginatedList.tsx b/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchPaginatedList/RunScriptBatchPaginatedList.tsx
index 812d616bf2..e52ab7bd78 100644
--- a/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchPaginatedList/RunScriptBatchPaginatedList.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/components/RunScriptBatchPaginatedList/RunScriptBatchPaginatedList.tsx
@@ -79,8 +79,7 @@ const RunScriptBatchPaginatedList = ({
     <>
       <a>{script.name}</a>
       <Button
-        variant="inverse"
-        iconStroke={!script.hasRun}
+        variant="secondary"
         onClick={(e: React.MouseEvent<HTMLButtonElement>) => {
           e.stopPropagation();
           onRunScript(script, onChange);
diff --git a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx
index 5126232941..adb494ad8c 100644
--- a/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx
+++ b/frontend/pages/hosts/components/DeleteHostModal/DeleteHostModal.tsx
@@ -89,7 +89,7 @@ const DeleteHostModal = ({
         >
           Delete
         </Button>
-        <Button onClick={onCancel} variant="inverse-alert">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/hosts/components/ScriptDetailsModal/ScriptDetailsModal.tsx b/frontend/pages/hosts/components/ScriptDetailsModal/ScriptDetailsModal.tsx
index 8a35ba23fe..bf7cc5523d 100644
--- a/frontend/pages/hosts/components/ScriptDetailsModal/ScriptDetailsModal.tsx
+++ b/frontend/pages/hosts/components/ScriptDetailsModal/ScriptDetailsModal.tsx
@@ -198,7 +198,7 @@ const ScriptDetailsModal = ({
             <>
               <Button
                 className={`${baseClass}__action-button`}
-                variant="icon"
+                variant="subdued"
                 onClick={() => onClickDownload()}
               >
                 <Icon name="download" />
@@ -209,7 +209,7 @@ const ScriptDetailsModal = ({
                   <Button
                     disabled={disableChildren}
                     className={`${baseClass}__action-button`}
-                    variant="icon"
+                    variant="subdued"
                     onClick={onDelete}
                   >
                     <Icon name="trash" color="ui-fleet-black-75" />
@@ -240,6 +240,7 @@ const ScriptDetailsModal = ({
                       selectedScriptDetails as IHostScript
                     )}
                     menuPlacement="top"
+                    variant="subdued"
                   />
                 </div>
               )}
diff --git a/frontend/pages/hosts/components/TransferHostModal/TransferHostModal.tsx b/frontend/pages/hosts/components/TransferHostModal/TransferHostModal.tsx
index 8d82753f27..60cd0d4ea5 100644
--- a/frontend/pages/hosts/components/TransferHostModal/TransferHostModal.tsx
+++ b/frontend/pages/hosts/components/TransferHostModal/TransferHostModal.tsx
@@ -125,7 +125,7 @@ const TransferHostModal = ({
           >
             Transfer
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/hosts/details/DeviceUserPage/components/DeviceUserBanners/DeviceUserBanners.tsx b/frontend/pages/hosts/details/DeviceUserPage/components/DeviceUserBanners/DeviceUserBanners.tsx
index 01d3be45bd..d07078799b 100644
--- a/frontend/pages/hosts/details/DeviceUserPage/components/DeviceUserBanners/DeviceUserBanners.tsx
+++ b/frontend/pages/hosts/details/DeviceUserPage/components/DeviceUserBanners/DeviceUserBanners.tsx
@@ -128,7 +128,7 @@ const DeviceUserBanners = ({
           <InfoBanner
             cta={
               <Button
-                variant="inverse"
+                variant="secondary"
                 onClick={onTriggerEscrowLinuxKey}
                 className="create-key-button"
               >
diff --git a/frontend/pages/hosts/details/DeviceUserPage/components/InfoButton/InfoButton.tsx b/frontend/pages/hosts/details/DeviceUserPage/components/InfoButton/InfoButton.tsx
index 9b33f41e0b..0975514f5c 100644
--- a/frontend/pages/hosts/details/DeviceUserPage/components/InfoButton/InfoButton.tsx
+++ b/frontend/pages/hosts/details/DeviceUserPage/components/InfoButton/InfoButton.tsx
@@ -10,7 +10,7 @@ interface IInfoButton {
 
 const InfoButton = ({ onClick }: IInfoButton) => {
   return (
-    <Button className={baseClass} onClick={onClick} variant="inverse">
+    <Button className={baseClass} onClick={onClick} variant="subdued">
       <>
         Info <Icon name="info" size="small" />
       </>
diff --git a/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx b/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx
index 1be117b2a2..fcfccd70d0 100644
--- a/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx
+++ b/frontend/pages/hosts/details/DeviceUserPage/components/SettingUpYourDevice/SettingUpYourDevice.tsx
@@ -101,6 +101,7 @@ const SettingUpYourDevice = ({
               hideText="Details"
               caretPosition="after"
               onClick={() => setShowError(!showError)}
+              variant="secondary"
             />
             {showError && (
               <Textarea variant="code">{failedSoftware.error}</Textarea>
diff --git a/frontend/pages/hosts/details/HostDetailsPage/HostActionsDropdown/HostActionsDropdown.tsx b/frontend/pages/hosts/details/HostDetailsPage/HostActionsDropdown/HostActionsDropdown.tsx
index 134fa4215f..cc9d6f06ed 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/HostActionsDropdown/HostActionsDropdown.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/HostActionsDropdown/HostActionsDropdown.tsx
@@ -138,7 +138,7 @@ const HostActionsDropdown = ({
         placeholder="Actions"
         options={options}
         menuAlign="right"
-        variant="brand-button"
+        variant="primary"
       />
     </div>
   );
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/CancelActivityModal/CancelActivityModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/CancelActivityModal/CancelActivityModal.tsx
index bda605dabf..e10190809d 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/CancelActivityModal/CancelActivityModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/CancelActivityModal/CancelActivityModal.tsx
@@ -75,9 +75,6 @@ const CancelActivityModal = ({
         >
           Cancel activity
         </Button>
-        <Button variant="inverse-alert" onClick={onExit}>
-          Back
-        </Button>
       </div>
     </Modal>
   );
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/ClearPasscodeModal/ClearPasscodeModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/ClearPasscodeModal/ClearPasscodeModal.tsx
index a8f2adea5b..d0ead016a9 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/ClearPasscodeModal/ClearPasscodeModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/ClearPasscodeModal/ClearPasscodeModal.tsx
@@ -103,7 +103,7 @@ const ClearPasscodeModal = ({
         >
           Clear passcode
         </Button>
-        <Button onClick={onExit} variant="inverse-alert">
+        <Button onClick={onExit} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/ConfirmRunScriptModal/ConfirmRunScriptModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/ConfirmRunScriptModal/ConfirmRunScriptModal.tsx
index c4441e249a..671a6df12b 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/ConfirmRunScriptModal/ConfirmRunScriptModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/ConfirmRunScriptModal/ConfirmRunScriptModal.tsx
@@ -45,7 +45,7 @@ const ConfirmRunScriptModal = ({
           >
             Run
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/LockModal/LockModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/LockModal/LockModal.tsx
index 11df2ea8fd..3286836d18 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/LockModal/LockModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/LockModal/LockModal.tsx
@@ -165,7 +165,7 @@ const LockModal = ({
         >
           Lock
         </Button>
-        <Button onClick={onClose} variant="inverse">
+        <Button onClick={onClose} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/ManagedAccountModal/ManagedAccountModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/ManagedAccountModal/ManagedAccountModal.tsx
index 21830bc7ed..29eb4ecc75 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/ManagedAccountModal/ManagedAccountModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/ManagedAccountModal/ManagedAccountModal.tsx
@@ -115,7 +115,7 @@ const ManagedAccountModal = ({
               <Button onClick={onCancel}>Close</Button>
               {canRotatePassword && (
                 <Button
-                  variant="inverse"
+                  variant="secondary"
                   onClick={onRotatePassword}
                   disabled={isRotating}
                   className={`${baseClass}__rotate-button`}
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/RecoveryLockPasswordModal/RecoveryLockPasswordModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/RecoveryLockPasswordModal/RecoveryLockPasswordModal.tsx
index 115ac1a199..74af176a4d 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/RecoveryLockPasswordModal/RecoveryLockPasswordModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/RecoveryLockPasswordModal/RecoveryLockPasswordModal.tsx
@@ -79,7 +79,7 @@ const RecoveryLockPasswordModal = ({
 
     return (
       <Button
-        variant="inverse"
+        variant="secondary"
         onClick={onRotatePassword}
         disabled={isRotating}
         className={`${baseClass}__rotate-button`}
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx
index 951f790f07..61d549b20b 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/RunScriptModal/ScriptsTableConfig.tsx
@@ -166,7 +166,7 @@ export const generateTableColumnConfigs = (
             placeholder="Actions"
             disabled={scriptsDisabled}
             menuAlign="right"
-            variant="small-button"
+            variant="secondary"
           />
         );
       },
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx
index 49a155a586..cf2afcfe0b 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/UnenrollMdmModal/UnenrollMdmModal.tsx
@@ -151,7 +151,7 @@ const UnenrollMdmModal = ({
           >
             {buttonText}
           </Button>
-          <Button onClick={onClose} variant="inverse-alert">
+          <Button onClick={onClose} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/UnlockModal/UnlockModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/UnlockModal/UnlockModal.tsx
index ef1bd09db6..0313c15874 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/UnlockModal/UnlockModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/UnlockModal/UnlockModal.tsx
@@ -118,7 +118,7 @@ const UnlockModal = ({
         >
           Unlock
         </Button>
-        <Button onClick={onClose} variant="inverse">
+        <Button onClick={onClose} variant="secondary">
           Cancel
         </Button>
       </>
diff --git a/frontend/pages/hosts/details/HostDetailsPage/modals/WipeModal/WipeModal.tsx b/frontend/pages/hosts/details/HostDetailsPage/modals/WipeModal/WipeModal.tsx
index dcdf4e5bca..83c7eba793 100644
--- a/frontend/pages/hosts/details/HostDetailsPage/modals/WipeModal/WipeModal.tsx
+++ b/frontend/pages/hosts/details/HostDetailsPage/modals/WipeModal/WipeModal.tsx
@@ -107,7 +107,7 @@ const WipeModal = ({
         >
           Wipe
         </Button>
-        <Button onClick={onClose} variant="inverse-alert">
+        <Button onClick={onClose} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
index 311f8a1c9d..b91cf57440 100644
--- a/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
+++ b/frontend/pages/hosts/details/HostQueryReport/HQRTable/HQRTable.tsx
@@ -109,20 +109,22 @@ const HQRTable = ({
         <Button
           className={`${baseClass}__show-query-btn`}
           onClick={onShowQuery}
-          variant="inverse"
+          variant="secondary"
+          size="small"
         >
           <>
-            Show query <Icon name="eye" />
+            Show query <Icon name="eye" size="small" />
           </>
         </Button>
         <Button
           className={`${baseClass}__export-btn`}
           onClick={onExportQueryResults}
-          variant="inverse"
+          variant="secondary"
+          size="small"
         >
           <>
             Export results
-            <Icon name="download" />
+            <Icon name="download" size="small" />
           </>
         </Button>
       </div>
diff --git a/frontend/pages/hosts/details/HostQueryReport/HostQueryReport.tsx b/frontend/pages/hosts/details/HostQueryReport/HostQueryReport.tsx
index 386b667720..f89103b720 100644
--- a/frontend/pages/hosts/details/HostQueryReport/HostQueryReport.tsx
+++ b/frontend/pages/hosts/details/HostQueryReport/HostQueryReport.tsx
@@ -16,7 +16,6 @@ import {
 
 import Button from "components/buttons/Button";
 import BackButton from "components/BackButton";
-import Icon from "components/Icon";
 import MainContent from "components/MainContent";
 import ShowQueryModal from "components/modals/ShowQueryModal";
 import Spinner from "components/Spinner";
@@ -125,16 +124,11 @@ const HostQueryReport = ({
         <div className={`${baseClass}__header__row2`}>
           {!hqrError && <h1 className="host-name">{hostName}</h1>}
           <Button
-            variant="brand-inverse-icon"
             onClick={() => {
               browserHistory.push(fullReportPath);
             }}
-            iconStroke
           >
-            <>
-              View data for all hosts
-              <Icon name="chevron-right" color="core-fleet-green" />
-            </>
+            View report for all hosts
           </Button>
         </div>
       </div>
diff --git a/frontend/pages/hosts/details/HostReportsTab/HostReportCard.tsx b/frontend/pages/hosts/details/HostReportsTab/HostReportCard.tsx
index 39d1fc09c6..d5f323600d 100644
--- a/frontend/pages/hosts/details/HostReportsTab/HostReportCard.tsx
+++ b/frontend/pages/hosts/details/HostReportsTab/HostReportCard.tsx
@@ -152,7 +152,7 @@ const HostReportCard = ({
         >
           <Button
             className={`${baseClass}__view-full-report`}
-            variant="inverse"
+            variant="subdued"
             size="small"
             onClick={() => onShowDetails(report)}
           >
@@ -192,7 +192,7 @@ const HostReportCard = ({
             options={actionOptions}
             placeholder="Actions"
             onChange={onActionChange}
-            variant="button"
+            variant="secondary"
             menuAlign="right"
           />
         </div>
diff --git a/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsResendCell/OSSettingsResendCell.tsx b/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsResendCell/OSSettingsResendCell.tsx
index e83f3556c4..ed78dfda43 100644
--- a/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsResendCell/OSSettingsResendCell.tsx
+++ b/frontend/pages/hosts/details/OSSettingsModal/OSSettingsTable/OSSettingsResendCell/OSSettingsResendCell.tsx
@@ -34,11 +34,11 @@ const ResendButton = ({ isResending, onClick }: IResendButtonProps) => {
     <Button
       disabled={isResending}
       onClick={onClick}
-      variant="inverse"
+      variant="secondary"
       className={classNames}
       size="small"
     >
-      <Icon name="refresh" color="ui-fleet-black-75" size="small" />
+      <Icon name="refresh" size="small" />
       {buttonText}
     </Button>
   );
@@ -60,11 +60,11 @@ const RotateButton = ({ isRotating, onClick }: IRotateButtonProps) => {
     <Button
       disabled={isRotating}
       onClick={onClick}
-      variant="inverse"
+      variant="secondary"
       className={classNames}
       size="small"
     >
-      <Icon name="refresh" color="ui-fleet-black-75" size="small" />
+      <Icon name="refresh" size="small" />
       {buttonText}
     </Button>
   );
diff --git a/frontend/pages/hosts/details/cards/Certificates/CertificatesTable/CertificatesTableConfig.tsx b/frontend/pages/hosts/details/cards/Certificates/CertificatesTable/CertificatesTableConfig.tsx
index d2172f62cb..6fef1f416c 100644
--- a/frontend/pages/hosts/details/cards/Certificates/CertificatesTable/CertificatesTableConfig.tsx
+++ b/frontend/pages/hosts/details/cards/Certificates/CertificatesTable/CertificatesTableConfig.tsx
@@ -104,7 +104,6 @@ const generateTableConfig = (): IHostCertificatesTableConfig[] => {
             className="view-cert-details"
             noLink
             rowHover
-            excludeChevron
             customText="View details"
           />
         );
diff --git a/frontend/pages/hosts/details/cards/HostHeader/HostHeader.tsx b/frontend/pages/hosts/details/cards/HostHeader/HostHeader.tsx
index 30c02692ba..5a62b2edab 100644
--- a/frontend/pages/hosts/details/cards/HostHeader/HostHeader.tsx
+++ b/frontend/pages/hosts/details/cards/HostHeader/HostHeader.tsx
@@ -54,7 +54,7 @@ const RefetchButton = ({
             className={classNames}
             disabled={isDisabled || isFetching}
             onClick={onRefetchHost}
-            variant="inverse"
+            variant="secondary"
           >
             <Icon name="refresh" color="ui-fleet-black-75" size="small" />
             {buttonText}
diff --git a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostInstallerActionCell/HostInstallerActionCell.tsx b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostInstallerActionCell/HostInstallerActionCell.tsx
index d0e00c90d0..2801ab7e30 100644
--- a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostInstallerActionCell/HostInstallerActionCell.tsx
+++ b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostInstallerActionCell/HostInstallerActionCell.tsx
@@ -188,7 +188,7 @@ export const HostInstallerActionButton = ({
       position="top"
     >
       <Button
-        variant="inverse"
+        variant="secondary"
         type="button"
         className={`${baseClass}__item-action-button`}
         onClick={onClick}
@@ -378,7 +378,7 @@ export const HostInstallerActionCell = ({
               uninstallTooltip,
               buttonDisplayConfig.uninstall.text
             )}
-            variant="small-button"
+            variant="secondary"
             disabled={moreDisabled}
           />
         </div>
diff --git a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibrary.tsx b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibrary.tsx
index cb3b434407..a36eabbd24 100644
--- a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibrary.tsx
+++ b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibrary.tsx
@@ -32,8 +32,6 @@ import { notify } from "components/ToastNotification";
 import CardHeader from "components/CardHeader";
 import DataError from "components/DataError";
 import Spinner from "components/Spinner";
-import Button from "components/buttons/Button";
-import Icon from "components/Icon";
 import SoftwareInstallDetailsModal from "components/ActivityDetails/InstallDetails/SoftwareInstallDetailsModal";
 import SoftwareIpaInstallDetailsModal from "components/ActivityDetails/InstallDetails/SoftwareIpaInstallDetailsModal";
 import SoftwareScriptDetailsModal from "components/ActivityDetails/InstallDetails/SoftwareScriptDetailsModal";
@@ -634,12 +632,6 @@ const HostSoftwareLibrary = ({
     <div className={baseClass}>
       <div className={`${baseClass}__header`}>
         <CardHeader subheader="Software available to be installed on this host" />
-        {canAddSoftware && (
-          <Button variant="inverse" onClick={onAddSoftware}>
-            <Icon name="plus" />
-            <span>Add software</span>
-          </Button>
-        )}
       </div>
       {renderHostSoftware()}
       {selectedSoftwareUpdates && (
diff --git a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTable.tsx b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTable.tsx
index 9d6d60e96f..0f6576a14f 100644
--- a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTable.tsx
+++ b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTable.tsx
@@ -18,6 +18,7 @@ import { ITableQueryData } from "components/TableContainer/TableContainer";
 import { CustomOptionType } from "components/forms/fields/DropdownWrapper/DropdownWrapper";
 
 import Button from "components/buttons/Button";
+import Icon from "components/Icon";
 import EmptySoftwareTable from "pages/SoftwarePage/components/tables/EmptySoftwareTable";
 import TableCount from "components/TableContainer/TableCount";
 import EmptyState from "components/EmptyState";
@@ -193,22 +194,34 @@ const HostSoftwareLibraryTable = ({
 
   const renderCustomControls = () => {
     return (
-      <div className={`${baseClass}__filter-controls`}>
-        <DropdownWrapper
-          name="host-library-filter"
-          value={selfService ? "selfService" : "available"}
-          className={`${baseClass}__host-library-filter`}
-          options={DROPDOWN_OPTIONS}
-          onChange={(newValue: SingleValue<CustomOptionType>) =>
-            newValue &&
-            handleCustomFilterDropdownChange(
-              newValue.value as IHostSWLibraryDropdownFilterVal
-            )
-          }
-          variant="table-filter"
-          isDisabled={isTrulyEmpty}
-        />
-      </div>
+      <>
+        <div className={`${baseClass}__filter-controls`}>
+          <DropdownWrapper
+            name="host-library-filter"
+            value={selfService ? "selfService" : "available"}
+            className={`${baseClass}__host-library-filter`}
+            options={DROPDOWN_OPTIONS}
+            onChange={(newValue: SingleValue<CustomOptionType>) =>
+              newValue &&
+              handleCustomFilterDropdownChange(
+                newValue.value as IHostSWLibraryDropdownFilterVal
+              )
+            }
+            variant="table-filter"
+            isDisabled={isTrulyEmpty}
+          />
+        </div>
+        {canAddSoftware && !isTrulyEmpty && (
+          <Button
+            className={`${baseClass}__add-software-button`}
+            variant="secondary"
+            onClick={onAddSoftware}
+          >
+            <Icon name="plus" />
+            <span>Add software</span>
+          </Button>
+        )}
+      </>
     );
   };
 
diff --git a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTableConfig.tsx b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTableConfig.tsx
index 58a3df9ea5..e438f31f05 100644
--- a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTableConfig.tsx
+++ b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/HostSoftwareLibraryTableConfig.tsx
@@ -208,7 +208,13 @@ export const generateHostSWLibraryTableHeaders = ({
       },
     },
     {
-      Header: "Actions",
+      Header: "",
+      // Deliberately not "actions" — that class name collides with a
+      // shared, unrelated `td.actions__cell` rule in DataTable/_styles.scss
+      // (text-align: right; max-width: 99px) built for a small "..." dropdown
+      // pattern elsewhere in the app, which squished these Install/Uninstall
+      // buttons and right-aligned them.
+      id: "installer-actions",
       accessor: (originalRow) => originalRow.ui_status,
       disableSortBy: true,
       Cell: (cellProps: IActionCellProps) => {
diff --git a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/_styles.scss b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/_styles.scss
index 87be32845b..209512355b 100644
--- a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/_styles.scss
+++ b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/HostSoftwareLibraryTable/_styles.scss
@@ -1,9 +1,42 @@
 .host-sw-library-table {
+  // TableContainer always renders its filter/customControl slot before the
+  // search box, with no prop to place something after it. `display: contents`
+  // unwraps the two intermediate flex containers so the dropdown, search box,
+  // and "Add software" button become direct siblings under `__header`, which
+  // lets `order` put "Add software" after the search box like the design
+  // calls for.
+  .table-container__header {
+    justify-content: flex-start;
+  }
+
+  .table-container__header-left {
+    display: contents;
+  }
+
+  .controls {
+    display: contents;
+  }
+
+  .table-container__results-count {
+    order: 1;
+  }
+
   &__filter-controls {
     width: 230px;
+    order: 2;
+    // Pushes the dropdown/search/button group to the right, restoring the
+    // separation from the item count that `justify-content: flex-start`
+    // above removed (count and this group used to be split apart by the
+    // default `justify-content: space-between`).
+    margin-left: auto;
   }
 
   .table-container__search {
     width: 315px;
+    order: 3;
+  }
+
+  &__add-software-button {
+    order: 4;
   }
 }
diff --git a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/_styles.scss b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/_styles.scss
index 9de6a9a599..0b6da6c78f 100644
--- a/frontend/pages/hosts/details/cards/HostSoftwareLibrary/_styles.scss
+++ b/frontend/pages/hosts/details/cards/HostSoftwareLibrary/_styles.scss
@@ -38,7 +38,7 @@
   &__item-actions {
     display: flex;
     flex-direction: row;
-    gap: $pad-medium;
+    gap: $pad-small;
     align-items: center;
   }
 
@@ -71,6 +71,12 @@
 
     .data-table-block {
       .data-table__table {
+        thead {
+          .installer-actions__header {
+            border-left: none;
+          }
+        }
+
         tbody {
           tr {
             .name__cell {
@@ -85,7 +91,7 @@
               }
             }
 
-            .Actions__cell {
+            .installer-actions__cell {
               display: flex;
 
               // Undoes vertical click margin found on table container tooltips
diff --git a/frontend/pages/hosts/details/cards/HostSummary/BootstrapPackageIndicator/BootstrapPackageIndicator.tsx b/frontend/pages/hosts/details/cards/HostSummary/BootstrapPackageIndicator/BootstrapPackageIndicator.tsx
index c50ca8cfcd..37ab0177f0 100644
--- a/frontend/pages/hosts/details/cards/HostSummary/BootstrapPackageIndicator/BootstrapPackageIndicator.tsx
+++ b/frontend/pages/hosts/details/cards/HostSummary/BootstrapPackageIndicator/BootstrapPackageIndicator.tsx
@@ -66,7 +66,7 @@ const BootstrapPackageIndicator = ({
           ) : (
             <Button
               onClick={onClick}
-              variant="inverse"
+              variant="subdued"
               className={`${baseClass}__button`}
             >
               {displayData.displayText}
diff --git a/frontend/pages/hosts/details/cards/Policies/HostPoliciesTable/PolicyDetailsModal/PolicyDetailsModal.tsx b/frontend/pages/hosts/details/cards/Policies/HostPoliciesTable/PolicyDetailsModal/PolicyDetailsModal.tsx
index 34f47e4809..ffc1ed5791 100644
--- a/frontend/pages/hosts/details/cards/Policies/HostPoliciesTable/PolicyDetailsModal/PolicyDetailsModal.tsx
+++ b/frontend/pages/hosts/details/cards/Policies/HostPoliciesTable/PolicyDetailsModal/PolicyDetailsModal.tsx
@@ -58,7 +58,7 @@ const PolicyDetailsModal = ({
           {policy?.conditional_access_enabled &&
             policy.response === "fail" &&
             onResolveLater && (
-              <Button onClick={onResolveLater} variant="inverse">
+              <Button onClick={onResolveLater} variant="secondary">
                 Resolve later
               </Button>
             )}
diff --git a/frontend/pages/hosts/details/cards/Queries/HostQueries.tsx b/frontend/pages/hosts/details/cards/Queries/HostQueries.tsx
index ab4c9ff056..0a6a61a38b 100644
--- a/frontend/pages/hosts/details/cards/Queries/HostQueries.tsx
+++ b/frontend/pages/hosts/details/cards/Queries/HostQueries.tsx
@@ -143,7 +143,7 @@ const HostQueries = ({
       <div className={`${baseClass}__header`}>
         <CardHeader header="Reports" />
         {canAddQuery && (
-          <Button variant="inverse" onClick={onClickAddQuery} size="small">
+          <Button variant="secondary" onClick={onClickAddQuery} size="small">
             <Icon name="plus" />
             Add report
           </Button>
diff --git a/frontend/pages/hosts/details/cards/Queries/ReportUpdatedCell/ReportUpdatedCell.tsx b/frontend/pages/hosts/details/cards/Queries/ReportUpdatedCell/ReportUpdatedCell.tsx
index 9ec3bf5b10..ad3971473e 100644
--- a/frontend/pages/hosts/details/cards/Queries/ReportUpdatedCell/ReportUpdatedCell.tsx
+++ b/frontend/pages/hosts/details/cards/Queries/ReportUpdatedCell/ReportUpdatedCell.tsx
@@ -115,7 +115,7 @@ const ReportUpdatedCell = ({
       {should_link_to_hqr && hostId && queryId && (
         // parent row has same onClick functionality but link here is required for keyboard accessibility
         <Button
-          variant="inverse"
+          variant="subdued"
           className={`${baseClass}__view-report`}
           onClick={onClick}
           size="small"
diff --git a/frontend/pages/hosts/details/cards/Software/HostSoftwareTable/HostSoftwareTable.tsx b/frontend/pages/hosts/details/cards/Software/HostSoftwareTable/HostSoftwareTable.tsx
index 15be2ce39c..beeb243944 100644
--- a/frontend/pages/hosts/details/cards/Software/HostSoftwareTable/HostSoftwareTable.tsx
+++ b/frontend/pages/hosts/details/cards/Software/HostSoftwareTable/HostSoftwareTable.tsx
@@ -204,7 +204,7 @@ const HostSoftwareTable = ({
         disableTooltip={!hasVulnFilters}
       >
         <Button
-          variant="inverse"
+          variant="secondary"
           onClick={onAddFiltersClick}
           disabled={isTrulyEmpty}
         >
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/_styles.scss b/frontend/pages/hosts/details/cards/Software/SelfService/_styles.scss
index dba0661c5f..8f6a62d0b3 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/_styles.scss
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/_styles.scss
@@ -82,7 +82,7 @@
     .self-service-table__item-actions {
       display: flex;
       flex-direction: row;
-      gap: $pad-large;
+      gap: $pad-small;
     }
   }
 
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/components/CategoryFilter/CategoryFilter.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/components/CategoryFilter/CategoryFilter.tsx
index 84f6b2461e..ec068466c8 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/components/CategoryFilter/CategoryFilter.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/components/CategoryFilter/CategoryFilter.tsx
@@ -130,7 +130,7 @@ const CategoryFilter = ({
   const wrapperRef = useRef<HTMLDivElement>(null);
 
   // Close menu when clicking outside the wrapper (mirrors the
-  // ActionsDropdown brand-button pattern in components/ActionsDropdown).
+  // ActionsDropdown primary-variant pattern in components/ActionsDropdown).
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
       if (
@@ -292,7 +292,7 @@ const CategoryFilter = ({
         A real Fleet <Button> renders the visible trigger so it inherits
         the Button's :focus-visible outline (Button/_styles.scss
         button-variant mixin). react-select's own Control is hidden via
-        components.Control: () => null. This mirrors the brand-button
+        components.Control: () => null. This mirrors the primary variant
         path in components/ActionsDropdown/ActionsDropdown.tsx.
       */}
       <Button
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryButton.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryButton.tsx
index 33556372d0..89451ba161 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryButton.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryButton.tsx
@@ -73,7 +73,7 @@ const InstallAllInCategoryButton = ({
     <>
       <Button
         className={baseClass}
-        variant="inverse"
+        variant="secondary"
         onClick={() => setShowModal(true)}
         disabled={isDisabled}
       >
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryModal.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryModal.tsx
index 532e591932..afdee09efb 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryModal.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/components/InstallAllInCategoryButton/InstallAllInCategoryModal.tsx
@@ -34,7 +34,7 @@ const InstallAllInCategoryModal = ({
           <Button onClick={onConfirm} isLoading={isSubmitting}>
             Install all
           </Button>
-          <Button variant="inverse" onClick={onExit} disabled={isSubmitting}>
+          <Button variant="secondary" onClick={onExit} disabled={isSubmitting}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/components/SoftwareUpdateModal/SoftwareUpdateModal.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/components/SoftwareUpdateModal/SoftwareUpdateModal.tsx
index a50e20ffa6..6bbfeac447 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/components/SoftwareUpdateModal/SoftwareUpdateModal.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/components/SoftwareUpdateModal/SoftwareUpdateModal.tsx
@@ -130,7 +130,7 @@ const SoftwareUpdateModal = ({
             </Button>
           ) : (
             <>
-              <Button variant="inverse" onClick={onExit}>
+              <Button variant="secondary" onClick={onExit}>
                 Cancel
               </Button>
               <Button type="submit" onClick={onClickUpdate}>
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/components/TileActionStatus/TileActionStatus.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/components/TileActionStatus/TileActionStatus.tsx
index bd5771b01a..989bd37843 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/components/TileActionStatus/TileActionStatus.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/components/TileActionStatus/TileActionStatus.tsx
@@ -113,7 +113,7 @@ const TileActionStatus = ({
         )}
         {actionLabel && (
           <Button
-            variant="inverse"
+            variant="secondary"
             onClick={handleClick}
             disabled={disableAction}
           >
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/components/UninstallSoftwareModal/UninstallSoftwareModal.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/components/UninstallSoftwareModal/UninstallSoftwareModal.tsx
index e2feb92deb..5aa6b1d603 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/components/UninstallSoftwareModal/UninstallSoftwareModal.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/components/UninstallSoftwareModal/UninstallSoftwareModal.tsx
@@ -61,7 +61,7 @@ const UninstallSoftwareModal = ({
         >
           Uninstall
         </Button>
-        <Button variant="inverse-alert" onClick={onExit}>
+        <Button variant="secondary" onClick={onExit}>
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/components/UpdatesCard/UpdateSoftwareItem/UpdateSoftwareItem.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/components/UpdatesCard/UpdateSoftwareItem/UpdateSoftwareItem.tsx
index 2b6dd0be0f..5102de94b7 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/components/UpdatesCard/UpdateSoftwareItem/UpdateSoftwareItem.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/components/UpdatesCard/UpdateSoftwareItem/UpdateSoftwareItem.tsx
@@ -124,7 +124,7 @@ const InstallerStatus = ({
             <span data-testid={`${baseClass}__status--test`}>
               <Button
                 className={`${baseClass}__item-status-button`}
-                variant="inverse"
+                variant="subdued"
                 onClick={() => {
                   onShowInstallerDetails();
                 }}
diff --git a/frontend/pages/hosts/details/cards/User/User.tsx b/frontend/pages/hosts/details/cards/User/User.tsx
index 320eb4ddbb..d9cbbce700 100644
--- a/frontend/pages/hosts/details/cards/User/User.tsx
+++ b/frontend/pages/hosts/details/cards/User/User.tsx
@@ -76,7 +76,7 @@ const User = ({
         <CardHeader header="User" />
         <div className={`${baseClass}__header-actions`}>
           {canViewMyDeviceLink && (
-            <Button variant="inverse" onClick={onClickMyDevice} size="small">
+            <Button variant="secondary" onClick={onClickMyDevice} size="small">
               My device
               <Icon name="external-link" />
             </Button>
@@ -84,12 +84,12 @@ const User = ({
           {canWriteEndUser && (
             <Button
               className={`${baseClass}__add-user-btn`}
-              variant="inverse"
+              variant="secondary"
               onClick={onClickUpdateUser}
               size="small"
             >
+              <Icon name={writeButtonIcon} size="small" />
               {writeButtonText}
-              <Icon name={writeButtonIcon} />
             </Button>
           )}
         </div>
diff --git a/frontend/pages/hosts/details/cards/Vitals/Vitals.tsx b/frontend/pages/hosts/details/cards/Vitals/Vitals.tsx
index 6895245ff7..4376a44009 100644
--- a/frontend/pages/hosts/details/cards/Vitals/Vitals.tsx
+++ b/frontend/pages/hosts/details/cards/Vitals/Vitals.tsx
@@ -643,7 +643,7 @@ const Vitals = ({
         <span className={`${baseClass}__custom-vital-title`}>
           {vital.name}
           <Button
-            variant="icon"
+            variant="subdued"
             size="small"
             onClick={() => onEditCustomHostVital(vital)}
             ariaLabel={`Edit ${vital.name}`}
diff --git a/frontend/pages/hosts/details/modals/EditHostVitalModal/EditHostVitalModal.tsx b/frontend/pages/hosts/details/modals/EditHostVitalModal/EditHostVitalModal.tsx
index 3fdb080145..3f2740eac0 100644
--- a/frontend/pages/hosts/details/modals/EditHostVitalModal/EditHostVitalModal.tsx
+++ b/frontend/pages/hosts/details/modals/EditHostVitalModal/EditHostVitalModal.tsx
@@ -67,7 +67,7 @@ const EditHostVitalModal = ({
           <Button type="submit" isLoading={isSaving} disabled={isSaving}>
             Save
           </Button>
-          <Button variant="inverse" onClick={onCancel} disabled={isSaving}>
+          <Button variant="secondary" onClick={onCancel} disabled={isSaving}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/hosts/details/modals/LocationModal/LocationModal.tsx b/frontend/pages/hosts/details/modals/LocationModal/LocationModal.tsx
index 749b5dde38..81b94e7b2d 100644
--- a/frontend/pages/hosts/details/modals/LocationModal/LocationModal.tsx
+++ b/frontend/pages/hosts/details/modals/LocationModal/LocationModal.tsx
@@ -171,7 +171,7 @@ const LocationModal = ({
         <ModalFooter
           primaryButtons={
             <>
-              <Button type="button" onClick={onExit} variant="inverse">
+              <Button type="button" onClick={onExit} variant="secondary">
                 Cancel
               </Button>
               <Button type="button" onClick={onClickLock}>
diff --git a/frontend/pages/labels/ManageLabelsPage/LabelsTable/LabelsTableConfig.tsx b/frontend/pages/labels/ManageLabelsPage/LabelsTable/LabelsTableConfig.tsx
index 4b74ebdd4e..6f549cafcc 100644
--- a/frontend/pages/labels/ManageLabelsPage/LabelsTable/LabelsTableConfig.tsx
+++ b/frontend/pages/labels/ManageLabelsPage/LabelsTable/LabelsTableConfig.tsx
@@ -180,7 +180,7 @@ const generateTableHeaders = (
             onChange={(value: string) => onClickAction(value, label)}
             placeholder="Actions"
             menuAlign="right"
-            variant="small-button"
+            variant="secondary"
           />
         );
       },
diff --git a/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx b/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
index ab947a337d..2c146ddcdb 100644
--- a/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
+++ b/frontend/pages/labels/NewLabelPage/NewLabelPage.tsx
@@ -539,7 +539,7 @@ const NewLabelPage = ({
               label="Query"
               labelActionComponent={
                 showOpenSidebarButton ? (
-                  <Button variant="inverse" onClick={onOpenSidebar}>
+                  <Button variant="subdued" onClick={onOpenSidebar}>
                     Schema
                     <Icon name="info" size="small" />
                   </Button>
@@ -709,7 +709,7 @@ const NewLabelPage = ({
           onClick={() => {
             router.goBack();
           }}
-          variant="inverse"
+          variant="secondary"
           disabled={isUpdating}
         >
           Cancel
diff --git a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
index 7f5c57d211..5547e8bd39 100644
--- a/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
+++ b/frontend/pages/labels/components/DynamicLabelForm/DynamicLabelForm.tsx
@@ -84,7 +84,7 @@ const DynamicLabelForm = ({
     }
 
     return (
-      <Button variant="inverse" onClick={onOpenSidebar}>
+      <Button variant="subdued" onClick={onOpenSidebar}>
         Schema
         <Icon name="info" size="small" />
       </Button>
diff --git a/frontend/pages/labels/components/LabelForm/LabelForm.tsx b/frontend/pages/labels/components/LabelForm/LabelForm.tsx
index cc5efea3e9..241133d08f 100644
--- a/frontend/pages/labels/components/LabelForm/LabelForm.tsx
+++ b/frontend/pages/labels/components/LabelForm/LabelForm.tsx
@@ -183,7 +183,7 @@ const LabelForm = ({
             </Button>
           )}
         />
-        <Button onClick={onCancel} variant="inverse">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/labels/components/ManualLabelForm/LabelHostTargetTableConfig.tsx b/frontend/pages/labels/components/ManualLabelForm/LabelHostTargetTableConfig.tsx
index 15687afb6a..dd20c67aed 100644
--- a/frontend/pages/labels/components/ManualLabelForm/LabelHostTargetTableConfig.tsx
+++ b/frontend/pages/labels/components/ManualLabelForm/LabelHostTargetTableConfig.tsx
@@ -26,7 +26,7 @@ export const generateTableHeaders = (
           Cell: (cellProps: ITableStringCellProps) => (
             <Button
               onClick={() => handleRowRemove(cellProps.row)}
-              variant="icon"
+              variant="subdued"
             >
               <Icon name="close-filled" />
             </Button>
diff --git a/frontend/pages/packs/EditPackPage/components/PackQueryEditorModal/PackQueryEditorModal.tsx b/frontend/pages/packs/EditPackPage/components/PackQueryEditorModal/PackQueryEditorModal.tsx
index dd0f3d1192..519a2f5b89 100644
--- a/frontend/pages/packs/EditPackPage/components/PackQueryEditorModal/PackQueryEditorModal.tsx
+++ b/frontend/pages/packs/EditPackPage/components/PackQueryEditorModal/PackQueryEditorModal.tsx
@@ -252,7 +252,7 @@ const PackQueryEditorModal = ({
           >
             {editQuery?.name ? "Save" : "Add query"}
           </Button>
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx b/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx
index 545291cdab..918dcea469 100644
--- a/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx
+++ b/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx
@@ -43,7 +43,7 @@ const RemovePackQueryModal = ({
           >
             Remove
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/packs/ManagePacksPage/components/DeletePackModal/DeletePackModal.tsx b/frontend/pages/packs/ManagePacksPage/components/DeletePackModal/DeletePackModal.tsx
index 8f87bdec14..8e68bd758b 100644
--- a/frontend/pages/packs/ManagePacksPage/components/DeletePackModal/DeletePackModal.tsx
+++ b/frontend/pages/packs/ManagePacksPage/components/DeletePackModal/DeletePackModal.tsx
@@ -35,7 +35,7 @@ const DeletePackModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/packs/ManagePacksPage/components/PacksTable/PacksTable.tsx b/frontend/pages/packs/ManagePacksPage/components/PacksTable/PacksTable.tsx
index 2d6ce5258c..0889ff1f8f 100644
--- a/frontend/pages/packs/ManagePacksPage/components/PacksTable/PacksTable.tsx
+++ b/frontend/pages/packs/ManagePacksPage/components/PacksTable/PacksTable.tsx
@@ -88,14 +88,14 @@ const PacksTable = ({
       name: "enable",
       onClick: onEnablePackClick,
       buttonText: "Enable",
-      variant: "inverse",
+      variant: "secondary",
       iconSvg: "check",
     },
     {
       name: "disable",
       onClick: onDisablePackClick,
       buttonText: "Disable",
-      variant: "inverse",
+      variant: "secondary",
       iconSvg: "disable",
     },
   ];
@@ -123,7 +123,7 @@ const PacksTable = ({
           name: "delete pack",
           buttonText: "Delete",
           iconSvg: "trash",
-          variant: "inverse",
+          variant: "secondary",
           onClick: onDeletePackClick,
         }}
         renderCount={renderPackCount}
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/AutomationsModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/AutomationsModal.tsx
index 0507ead721..bcc933592b 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/AutomationsModal.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/AutomationsModal.tsx
@@ -251,7 +251,7 @@ const AutomationsModal = ({
                     <>
                       <Button
                         type="button"
-                        variant="brand-inverse-icon"
+                        variant="secondary"
                         onClick={togglePreviewCalendarEvent}
                       >
                         Preview calendar event
@@ -298,7 +298,7 @@ const AutomationsModal = ({
           <Button type="submit" isLoading={isUpdating} disabled={isUpdating}>
             Save
           </Button>
-          <Button type="button" onClick={onExit} variant="inverse">
+          <Button type="button" onClick={onExit} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/CalendarEventsModal/CalendarEventsModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/CalendarEventsModal/CalendarEventsModal.tsx
index 247af5332e..463fbf0665 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/CalendarEventsModal/CalendarEventsModal.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/CalendarEventsModal/CalendarEventsModal.tsx
@@ -195,6 +195,7 @@ const CalendarEventsModal = forwardRef<
                 showText="Example payload"
                 caretPosition="after"
                 onClick={() => setShowExamplePayload(!showExamplePayload)}
+                variant="secondary"
               />
               {showExamplePayload && renderExamplePayload()}
             </>
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx
index 5fe021aa3d..4cf2c27c48 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/AutomationsModal/components/OtherWorkflowsModal/OtherWorkflowsModal.tsx
@@ -269,6 +269,7 @@ const OtherWorkflowsModal = forwardRef<
             showText="Show example ticket"
             caretPosition="after"
             onClick={() => setShowExampleTicket(!showExampleTicket)}
+            variant="secondary"
           />
           {showExampleTicket && (
             <ExampleTicket
@@ -352,6 +353,7 @@ const OtherWorkflowsModal = forwardRef<
               showText="Example payload"
               caretPosition="after"
               onClick={() => setShowExamplePayload(!showExamplePayload)}
+              variant="secondary"
             />
             {showExamplePayload && <ExamplePayload />}
           </>
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/DeletePoliciesModal/DeletePoliciesModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/DeletePoliciesModal/DeletePoliciesModal.tsx
index fb0f5b1150..b82f4633c3 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/DeletePoliciesModal/DeletePoliciesModal.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/DeletePoliciesModal/DeletePoliciesModal.tsx
@@ -36,7 +36,7 @@ const DeletePoliciesModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/ManageAutomationsModal/ManageAutomationsModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/ManageAutomationsModal/ManageAutomationsModal.tsx
index 2951ba18a9..b929fca2d0 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/ManageAutomationsModal/ManageAutomationsModal.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/ManageAutomationsModal/ManageAutomationsModal.tsx
@@ -139,7 +139,7 @@ const ManageAutomationsModal = ({
           <Button type="submit" isLoading={isSaving} disabled={isSaving}>
             Save
           </Button>
-          <Button type="button" onClick={onExit} variant="inverse">
+          <Button type="button" onClick={onExit} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesPaginatedList/PoliciesPaginatedList.tsx b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesPaginatedList/PoliciesPaginatedList.tsx
index c6f6500358..96c5db2fd4 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesPaginatedList/PoliciesPaginatedList.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesPaginatedList/PoliciesPaginatedList.tsx
@@ -323,7 +323,7 @@ function PoliciesPaginatedList(
             </TooltipWrapper>
           )}
         />
-        <Button onClick={onCancel} variant="inverse">
+        <Button onClick={onCancel} variant="secondary">
           Cancel
         </Button>
       </div>
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx
index bea62a7246..bd66c50d35 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/PoliciesTable/PoliciesTable.tsx
@@ -240,7 +240,7 @@ const PoliciesTable = ({
           name: "delete policy",
           buttonText: "Delete",
           iconSvg: "trash",
-          variant: "inverse",
+          variant: "secondary",
           onClick: onDeletePoliciesClick,
         }}
         emptyComponent={() => (
diff --git a/frontend/pages/policies/components/PatchAutomationCta/PatchAutomationCta.tsx b/frontend/pages/policies/components/PatchAutomationCta/PatchAutomationCta.tsx
index 1b494c754e..909569221a 100644
--- a/frontend/pages/policies/components/PatchAutomationCta/PatchAutomationCta.tsx
+++ b/frontend/pages/policies/components/PatchAutomationCta/PatchAutomationCta.tsx
@@ -53,7 +53,7 @@ const PatchAutomationCta = ({
         renderChildren={(disableChildren) => (
           <Button
             onClick={onAddAutomation}
-            variant="text-icon"
+            variant="secondary"
             disabled={disableChildren || isAddingAutomation}
           >
             {isAddingAutomation ? (
diff --git a/frontend/pages/policies/details/PolicyDetailsPage/PolicyDetailsPage.tsx b/frontend/pages/policies/details/PolicyDetailsPage/PolicyDetailsPage.tsx
index d773037645..2fd4cfca0c 100644
--- a/frontend/pages/policies/details/PolicyDetailsPage/PolicyDetailsPage.tsx
+++ b/frontend/pages/policies/details/PolicyDetailsPage/PolicyDetailsPage.tsx
@@ -413,14 +413,14 @@ const PolicyDetailsPage = ({
                 <Button
                   className={`${baseClass}__show-query-btn`}
                   onClick={() => setShowQueryModal(true)}
-                  variant="inverse"
+                  variant="secondary"
                 >
                   Show query
                 </Button>
                 {canRunPolicy && (
                   <Button
                     className={`${baseClass}__run`}
-                    variant="inverse"
+                    variant="secondary"
                     onClick={() => {
                       policyId &&
                         router.push(
diff --git a/frontend/pages/policies/details/components/PolicyAutomationActivityDetailsModal/PolicyAutomationActivityDetailsModal.tsx b/frontend/pages/policies/details/components/PolicyAutomationActivityDetailsModal/PolicyAutomationActivityDetailsModal.tsx
index ed5deef174..3679f237a8 100644
--- a/frontend/pages/policies/details/components/PolicyAutomationActivityDetailsModal/PolicyAutomationActivityDetailsModal.tsx
+++ b/frontend/pages/policies/details/components/PolicyAutomationActivityDetailsModal/PolicyAutomationActivityDetailsModal.tsx
@@ -108,7 +108,7 @@ const PolicyAutomationActivityDetailsModal = ({
           <Button onClick={onCancel}>Done</Button>
           {onResetPolicy && (
             <Button
-              variant="inverse"
+              variant="secondary"
               onClick={onResetPolicy}
               className={`${baseClass}__reset`}
             >
diff --git a/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTable.tsx b/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTable.tsx
index f6df15478a..27092912d0 100644
--- a/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTable.tsx
+++ b/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTable.tsx
@@ -225,7 +225,7 @@ const PolicyAutomationsActivitiesTable = ({
           )}
           <div className={`${baseClass}__controls`}>
             {canResetPolicy && (
-              <Button variant="inverse" onClick={onClickResetPolicy}>
+              <Button variant="subdued" onClick={onClickResetPolicy}>
                 Reset policy
                 <Icon name="refresh" />
               </Button>
diff --git a/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTableConfig.tsx b/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTableConfig.tsx
index 0ffd59af3d..e11bcb18c5 100644
--- a/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTableConfig.tsx
+++ b/frontend/pages/policies/details/components/PolicyAutomationsActivitiesTable/PolicyAutomationsActivitiesTableConfig.tsx
@@ -94,7 +94,7 @@ const generateColumnConfigs = (
       return (
         <Button
           className={`${baseClass}__details-cell`}
-          variant="inverse"
+          variant="subdued"
           onClick={() => onShowDetails(activity)}
         >
           <span className={`${baseClass}__details-text`}>
diff --git a/frontend/pages/policies/details/components/PolicyResetModal/PolicyResetModal.tsx b/frontend/pages/policies/details/components/PolicyResetModal/PolicyResetModal.tsx
index a31c62df67..9381a1ad40 100644
--- a/frontend/pages/policies/details/components/PolicyResetModal/PolicyResetModal.tsx
+++ b/frontend/pages/policies/details/components/PolicyResetModal/PolicyResetModal.tsx
@@ -69,7 +69,7 @@ const PolicyResetModal = ({
           >
             Reset
           </Button>
-          <Button variant="inverse" onClick={onCancel}>
+          <Button variant="secondary" onClick={onCancel}>
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/policies/edit/components/PolicyErrorsTable/PolicyErrorsTable.tsx b/frontend/pages/policies/edit/components/PolicyErrorsTable/PolicyErrorsTable.tsx
index 92ca0c8597..e5b82c78e3 100644
--- a/frontend/pages/policies/edit/components/PolicyErrorsTable/PolicyErrorsTable.tsx
+++ b/frontend/pages/policies/edit/components/PolicyErrorsTable/PolicyErrorsTable.tsx
@@ -41,7 +41,7 @@ const PolicyErrorsTable = ({
           name: "delete policy",
           buttonText: "Delete",
           iconSvg: "trash",
-          variant: "inverse",
+          variant: "secondary",
         }}
         emptyComponent={() => <EmptyState header="No hosts are online" />}
         onQueryChange={noop}
diff --git a/frontend/pages/policies/edit/components/PolicyForm/PolicyForm.tsx b/frontend/pages/policies/edit/components/PolicyForm/PolicyForm.tsx
index b2329ee9f5..07fd52d86a 100644
--- a/frontend/pages/policies/edit/components/PolicyForm/PolicyForm.tsx
+++ b/frontend/pages/policies/edit/components/PolicyForm/PolicyForm.tsx
@@ -490,7 +490,7 @@ const PolicyForm = ({
     return (
       <div className={`${baseClass}__sql-editor-label-actions`}>
         {showOpenSchemaActionText && (
-          <Button variant="inverse" onClick={onOpenSchemaSidebar}>
+          <Button variant="subdued" onClick={onOpenSchemaSidebar}>
             <>
               Schema
               <Icon name="info" />
@@ -798,7 +798,7 @@ const PolicyForm = ({
                     (isEditMode && !isAnyPlatformSelected) ||
                     disabledLiveQuery
                   }
-                  variant="inverse"
+                  variant="secondary"
                 >
                   Run policy <Icon name="run" />
                 </Button>
diff --git a/frontend/pages/policies/edit/components/PolicyResults/PolicyResults.tsx b/frontend/pages/policies/edit/components/PolicyResults/PolicyResults.tsx
index 762364795f..49241bd402 100644
--- a/frontend/pages/policies/edit/components/PolicyResults/PolicyResults.tsx
+++ b/frontend/pages/policies/edit/components/PolicyResults/PolicyResults.tsx
@@ -113,7 +113,7 @@ const PolicyResults = ({
         <Button
           className={`${baseClass}__show-query-btn`}
           onClick={onShowQueryModal}
-          variant="inverse"
+          variant="secondary"
         >
           <>
             Show query <Icon name="eye" />
@@ -124,7 +124,7 @@ const PolicyResults = ({
           onClick={
             tableType === "errors" ? onExportErrorsResults : onExportResults
           }
-          variant="inverse"
+          variant="secondary"
         >
           <>
             Export {tableType}
diff --git a/frontend/pages/policies/edit/components/PolicyResultsTable/PolicyResultsTable.tsx b/frontend/pages/policies/edit/components/PolicyResultsTable/PolicyResultsTable.tsx
index 877bdf707b..4bbe74773a 100644
--- a/frontend/pages/policies/edit/components/PolicyResultsTable/PolicyResultsTable.tsx
+++ b/frontend/pages/policies/edit/components/PolicyResultsTable/PolicyResultsTable.tsx
@@ -40,7 +40,7 @@ const PolicyResultsTable = ({
           name: "delete policy",
           buttonText: "Delete",
           iconSvg: "trash",
-          variant: "inverse",
+          variant: "secondary",
         }}
         emptyComponent={() => <EmptyState header="No hosts are online" />}
         onQueryChange={noop}
diff --git a/frontend/pages/policies/edit/components/SaveNewPolicyModal/SaveNewPolicyModal.tsx b/frontend/pages/policies/edit/components/SaveNewPolicyModal/SaveNewPolicyModal.tsx
index 9ddd596756..e3744f25d9 100644
--- a/frontend/pages/policies/edit/components/SaveNewPolicyModal/SaveNewPolicyModal.tsx
+++ b/frontend/pages/policies/edit/components/SaveNewPolicyModal/SaveNewPolicyModal.tsx
@@ -284,7 +284,7 @@ const SaveNewPolicyModal = ({
         >
           <div className="autofill-tooltip-wrapper">
             <Button
-              variant="inverse"
+              variant="subdued"
               disabled={aiFeaturesDisabled || disableForm}
               onClick={
                 labelName === "Description"
@@ -392,7 +392,7 @@ const SaveNewPolicyModal = ({
         ) : (
           <div className={`${baseClass}__add-automations`}>
             <Button
-              variant="text-icon"
+              variant="secondary"
               type="button"
               onClick={() => setShowAutomations(true)}
             >
@@ -455,7 +455,7 @@ const SaveNewPolicyModal = ({
             className={`${baseClass}__button--modal-cancel`}
             type="button"
             onClick={() => setIsSaveNewPolicyModalOpen(false)}
-            variant="inverse"
+            variant="secondary"
           >
             Cancel
           </Button>
diff --git a/frontend/pages/queries/ManageQueriesPage/components/DeleteQueryModal/DeleteQueryModal.tsx b/frontend/pages/queries/ManageQueriesPage/components/DeleteQueryModal/DeleteQueryModal.tsx
index 7d8e8011ca..fa3a1af5ef 100644
--- a/frontend/pages/queries/ManageQueriesPage/components/DeleteQueryModal/DeleteQueryModal.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/components/DeleteQueryModal/DeleteQueryModal.tsx
@@ -35,7 +35,7 @@ const DeleteQueryModal = ({
           >
             Delete
           </Button>
-          <Button onClick={onCancel} variant="inverse-alert">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx b/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx
index ff53abe508..e57eb55ca8 100644
--- a/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/components/ManageQueryAutomationsModal/ManageQueryAutomationsModal.tsx
@@ -226,7 +226,7 @@ const ManageQueryAutomationsModal = ({
         </div>
         <Button
           type="button"
-          variant="inverse"
+          variant="secondary"
           onClick={togglePreviewDataModal}
           className={`${baseClass}__preview-data`}
         >
@@ -247,7 +247,7 @@ const ManageQueryAutomationsModal = ({
               </Button>
             )}
           />
-          <Button onClick={onCancel} variant="inverse">
+          <Button onClick={onCancel} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx
index fa841e05cf..9d23485766 100644
--- a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx
@@ -298,7 +298,7 @@ const QueriesTable = ({
             name: "delete reports",
             buttonText: "Delete",
             iconSvg: "trash",
-            variant: "inverse",
+            variant: "secondary",
             onClick: onDeleteQueryClick,
           }}
           emptyComponent={() => <EmptyState {...emptyParams} />}
diff --git a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
index 0067cecf20..53c6ee7d1b 100644
--- a/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
+++ b/frontend/pages/queries/details/QueryDetailsPage/QueryDetailsPage.tsx
@@ -265,7 +265,7 @@ const QueryDetailsPage = ({
                 <Button
                   className={`${baseClass}__show-query-btn`}
                   onClick={onShowQueryModal}
-                  variant="inverse"
+                  variant="secondary"
                 >
                   Show query
                 </Button>
@@ -283,7 +283,7 @@ const QueryDetailsPage = ({
                       <div>
                         <Button
                           className={`${baseClass}__run`}
-                          variant="inverse"
+                          variant="secondary"
                           onClick={() => {
                             queryId &&
                               router.push(
diff --git a/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx b/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx
index 90c8616e8e..74d9999752 100644
--- a/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx
+++ b/frontend/pages/queries/details/components/QueryReport/QueryReport.tsx
@@ -83,11 +83,12 @@ const QueryReport = ({
         <Button
           className={`${baseClass}__export-btn`}
           onClick={onExportQueryResults}
-          variant="inverse"
+          variant="secondary"
+          size="small"
         >
           <>
             Export results
-            <Icon name="download" color="ui-fleet-black-75" />
+            <Icon name="download" size="small" />
           </>
         </Button>
       </div>
diff --git a/frontend/pages/queries/edit/components/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx b/frontend/pages/queries/edit/components/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx
index e45bcd1a4b..85acd59790 100644
--- a/frontend/pages/queries/edit/components/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx
+++ b/frontend/pages/queries/edit/components/ConfirmSaveChangesModal/ConfirmSaveChangesModal.tsx
@@ -36,7 +36,7 @@ const ConfirmSaveChangesModal = ({
           >
             Save
           </Button>
-          <Button onClick={onClose} variant="inverse">
+          <Button onClick={onClose} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx b/frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx
index 46c3d550ad..815602a2c9 100644
--- a/frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx
+++ b/frontend/pages/queries/edit/components/DiscardDataOption/DiscardDataOption.tsx
@@ -54,10 +54,9 @@ const DiscardDataOption = ({
               e.preventDefault();
               setForceEditDiscardData(true);
             }}
-            variant="text-icon"
+            variant="subdued"
             size="small"
             className={`${baseClass}__edit-anyway`}
-            iconStroke
           >
             <>
               Edit anyway
diff --git a/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx b/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
index 14aef22bff..6b98d0fabe 100644
--- a/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
+++ b/frontend/pages/queries/edit/components/EditQueryForm/EditQueryForm.tsx
@@ -435,7 +435,7 @@ const EditQueryForm = ({
     }
 
     return (
-      <Button variant="inverse" onClick={onOpenSchemaSidebar}>
+      <Button variant="subdued" onClick={onOpenSchemaSidebar}>
         <>
           Schema
           <Icon name="info" size="small" />
@@ -539,6 +539,7 @@ const EditQueryForm = ({
           hideText="Hide SQL"
           showText="Show SQL"
           onClick={() => setShowQueryEditor(!showQueryEditor)}
+          variant="secondary"
         />
       )}
       {showQueryEditor && (
@@ -782,6 +783,7 @@ const EditQueryForm = ({
                 showText="Advanced options"
                 caretPosition="after"
                 onClick={toggleAdvancedOptions}
+                variant="secondary"
               />
               {showAdvancedOptions && (
                 <>
@@ -821,7 +823,7 @@ const EditQueryForm = ({
                   <GitOpsModeTooltipWrapper
                     renderChildren={(disableChildren) => (
                       <Button
-                        variant="inverse"
+                        variant="secondary"
                         onClick={toggleSaveAsNewQueryModal}
                         disabled={disableSaveFormErrors || disableChildren}
                       >
@@ -862,7 +864,7 @@ const EditQueryForm = ({
             >
               <Button
                 className={`${baseClass}__run`}
-                variant="inverse"
+                variant="secondary"
                 onClick={() => {
                   // calling `setEditingExistingQuery` here prevents
                   // inclusion of `query_id` in the subsequent `run` API call, which prevents counting
diff --git a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
index 96ded4e0f8..fa8bca54c7 100644
--- a/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
+++ b/frontend/pages/queries/edit/components/QueryResults/QueryResults.tsx
@@ -193,7 +193,7 @@ const QueryResults = ({
         <Button
           className={`${baseClass}__show-query-btn`}
           onClick={onShowQueryModal}
-          variant="inverse"
+          variant="secondary"
         >
           <>
             Show query <Icon name="eye" />
@@ -206,7 +206,7 @@ const QueryResults = ({
               ? onExportErrorsResults
               : onExportQueryResults
           }
-          variant="inverse"
+          variant="secondary"
         >
           <>
             Export {tableType}
diff --git a/frontend/pages/queries/edit/components/SaveAsNewQueryModal/SaveAsNewQueryModal.tsx b/frontend/pages/queries/edit/components/SaveAsNewQueryModal/SaveAsNewQueryModal.tsx
index 5d61edb8ea..3caa6741b9 100644
--- a/frontend/pages/queries/edit/components/SaveAsNewQueryModal/SaveAsNewQueryModal.tsx
+++ b/frontend/pages/queries/edit/components/SaveAsNewQueryModal/SaveAsNewQueryModal.tsx
@@ -219,7 +219,7 @@ const SaveAsNewQueryModal = ({
           >
             Save
           </Button>
-          <Button onClick={onExit} variant="inverse">
+          <Button onClick={onExit} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/pages/queries/edit/components/SaveNewQueryModal/SaveNewQueryModal.tsx b/frontend/pages/queries/edit/components/SaveNewQueryModal/SaveNewQueryModal.tsx
index 3f4ab2daac..692e163974 100644
--- a/frontend/pages/queries/edit/components/SaveNewQueryModal/SaveNewQueryModal.tsx
+++ b/frontend/pages/queries/edit/components/SaveNewQueryModal/SaveNewQueryModal.tsx
@@ -340,6 +340,7 @@ const SaveNewQueryModal = ({
           showText="Advanced options"
           caretPosition="after"
           onClick={toggleAdvancedOptions}
+          variant="secondary"
         />
         {showAdvancedOptions && (
           <>
@@ -381,7 +382,7 @@ const SaveNewQueryModal = ({
           >
             Save
           </Button>
-          <Button onClick={toggleSaveNewQueryModal} variant="inverse">
+          <Button onClick={toggleSaveNewQueryModal} variant="secondary">
             Cancel
           </Button>
         </div>
diff --git a/frontend/styles/global/_global.scss b/frontend/styles/global/_global.scss
index 0240c478bf..a0e40b1ef9 100644
--- a/frontend/styles/global/_global.scss
+++ b/frontend/styles/global/_global.scss
@@ -149,7 +149,7 @@ form,
   }
 
   // Override button width to auto unless icon-only or wide buttons which has fixed widths
-  .button:not(.button--icon):not(.button--icon__small):not(.button__wide) {
+  .button:not(.button--icon):not(.button--icon__small):not(.button__wide):not(.button--icon-only) {
     width: auto;
   }
 
@@ -325,7 +325,9 @@ body.dark-mode .site-nav-item:not(.dup-org-logo):hover {
 body.dark-mode .card .button--inverse:hover,
 body.dark-mode .card .button--inverse-alert:hover,
 body.dark-mode .card .button--text-icon:hover,
-body.dark-mode .card .button--icon:hover {
+body.dark-mode .card .button--icon:hover,
+body.dark-mode .card .button--secondary:hover,
+body.dark-mode .card .button--subdued:hover {
   background-color: $core-fleet-white;
 }
 
@@ -334,7 +336,9 @@ body.dark-mode .card .button--icon:hover {
 body.dark-mode .modal__modal_container .button--inverse:hover,
 body.dark-mode .modal__modal_container .button--inverse-alert:hover,
 body.dark-mode .modal__modal_container .button--text-icon:hover,
-body.dark-mode .modal__modal_container .button--icon:hover {
+body.dark-mode .modal__modal_container .button--icon:hover,
+body.dark-mode .modal__modal_container .button--secondary:hover,
+body.dark-mode .modal__modal_container .button--subdued:hover {
   background-color: $ui-fleet-black-5;
 }
 
diff --git a/frontend/styles/var/colors.scss b/frontend/styles/var/colors.scss
index f5be7f7326..11618e583a 100644
--- a/frontend/styles/var/colors.scss
+++ b/frontend/styles/var/colors.scss
@@ -106,10 +106,6 @@
   --core-fleet-black-overlay-40: rgba(25, 33, 71, 0.4);
   --core-fleet-black-overlay-05: rgba(25, 33, 71, 0.05);
   --loading-overlay: rgba(255, 255, 255, 0.8);
-
-  // Dropdown menu outline — transparent in light mode (drop-shadow alone is
-  // enough); a 1px gray ring in dark mode where the shadow disappears.
-  --dropdown-menu-outline: transparent;
 }
 
 // ---------------------------------------------------------------------------
@@ -213,8 +209,6 @@ body.dark-mode {
   --core-fleet-black-overlay-40: rgba(0, 0, 0, 0.6);
   --core-fleet-black-overlay-05: rgba(226, 228, 234, 0.06);
   --loading-overlay: rgba(24, 26, 31, 0.8);
-
-  --dropdown-menu-outline: var(--ui-fleet-black-10);
 }
 
 // =============================================================================
diff --git a/frontend/styles/var/mixins.scss b/frontend/styles/var/mixins.scss
index 7b4e661a53..bc834af172 100644
--- a/frontend/styles/var/mixins.scss
+++ b/frontend/styles/var/mixins.scss
@@ -182,30 +182,6 @@ $max-width: 2560px;
   max-width: $max-width;
 }
 
-@mixin bordered-icon-button {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 36px;
-  height: 36px;
-  border: 1px solid $ui-fleet-black-10;
-  border-radius: $border-radius;
-  background-color: $core-fleet-white;
-  cursor: pointer;
-  padding: 0;
-  color: $core-fleet-black;
-  transition: border-color 100ms;
-
-  &:hover:not(:disabled) {
-    border-color: $ui-fleet-black-75-over;
-  }
-
-  &:focus-visible {
-    outline: 2px solid $ui-fleet-black-75-down;
-    outline-offset: 1px;
-  }
-}
-
 @mixin color-contrasted-sections {
   .section {
     display: flex;
@@ -261,6 +237,12 @@ $max-width: 2560px;
   gap: $pad-medium;
 }
 
+@mixin flex-column-8px-gap {
+  display: flex;
+  flex-direction: column;
+  gap: $pad-small;
+}
+
 @mixin vertical-form-layout {
   @include flex-column-24px-gap;
 }