diff --git a/libs/ui-components/src/components/Device/DeviceDetails/DeviceFleet.tsx b/libs/ui-components/src/components/Device/DeviceDetails/DeviceFleet.tsx
index 569d3107c..53468cfeb 100644
--- a/libs/ui-components/src/components/Device/DeviceDetails/DeviceFleet.tsx
+++ b/libs/ui-components/src/components/Device/DeviceDetails/DeviceFleet.tsx
@@ -22,6 +22,7 @@ const FleetLessDevice = () => {
         <Button
           isInline
           variant="plain"
+          style={{ paddingBlock: 0 }}
           icon={<OutlinedQuestionCircleIcon />}
           aria-label={t('Ownership information')}
         />
diff --git a/libs/ui-components/src/components/EnrollmentRequest/EnrollmentRequestTableRow.tsx b/libs/ui-components/src/components/EnrollmentRequest/EnrollmentRequestTableRow.tsx
index b538aaf19..0a671b34f 100644
--- a/libs/ui-components/src/components/EnrollmentRequest/EnrollmentRequestTableRow.tsx
+++ b/libs/ui-components/src/components/EnrollmentRequest/EnrollmentRequestTableRow.tsx
@@ -69,6 +69,7 @@ const EnrollmentRequestTableRow: React.FC<EnrollmentRequestTableRow> = ({
         <Td dataLabel={t('Approve')}>
           <Button
             variant="link"
+            isInline
             onClick={approveEnrollment}
             data-testid={`enrollment-request-approve-button-${rowIndex}`}
           >
diff --git a/libs/ui-components/src/components/common/CopyButton.tsx b/libs/ui-components/src/components/common/CopyButton.tsx
index 07081a438..3140c549e 100644
--- a/libs/ui-components/src/components/common/CopyButton.tsx
+++ b/libs/ui-components/src/components/common/CopyButton.tsx
@@ -1,16 +1,15 @@
 import * as React from 'react';
+import { Button, Icon, Tooltip } from '@patternfly/react-core';
 import { CopyIcon } from '@patternfly/react-icons/dist/js/icons/copy-icon';
-import { Button, ButtonProps, Icon, Tooltip } from '@patternfly/react-core';
 
 import { useTranslation } from '../../hooks/useTranslation';
 
 interface CopyButtonProps {
   text: string;
-  variant?: ButtonProps['variant'];
   ariaLabel?: string;
 }
 
-const CopyButton = ({ ariaLabel, text, variant }: CopyButtonProps) => {
+const CopyButton = ({ ariaLabel, text }: CopyButtonProps) => {
   const { t } = useTranslation();
 
   const [copied, setCopied] = React.useState(false);
@@ -37,8 +36,9 @@ const CopyButton = ({ ariaLabel, text, variant }: CopyButtonProps) => {
   return (
     <Tooltip content={copied ? t('Copied!') : ariaLabel || t('Copy text')}>
       <Button
-        variant={variant || 'plain'}
-        isInline={variant === 'link'}
+        variant="plain"
+        isInline
+        style={{ paddingBlock: 0 }}
         onClick={onCopy}
         icon={
           <Icon size="sm">
diff --git a/libs/ui-components/src/components/modals/ApproveDeviceModal/ApproveDeviceForm.tsx b/libs/ui-components/src/components/modals/ApproveDeviceModal/ApproveDeviceForm.tsx
index 07cac5c2a..6860975e5 100644
--- a/libs/ui-components/src/components/modals/ApproveDeviceModal/ApproveDeviceForm.tsx
+++ b/libs/ui-components/src/components/modals/ApproveDeviceModal/ApproveDeviceForm.tsx
@@ -10,7 +10,6 @@ import FlightCtlForm from '../../form/FlightCtlForm';
 import { FlightCtlLabel } from '../../../types/extraTypes';
 import { useTranslation } from '../../../hooks/useTranslation';
 import useDeviceLabelMatch from '../../../hooks/useDeviceLabelMatch';
-import ResourceLink from '../../common/ResourceLink';
 import DeviceLabelMatch from './DeviceLabelMatch';
 
 export type ApproveDeviceFormValues = {
@@ -42,7 +41,7 @@ const ApproveDeviceForm: React.FC<ApproveDeviceFormProps> = ({ enrollmentRequest
         isDisabled={!!defaultAlias}
       />
       <FormGroup label={t('Name')} aria-label={t('Name')}>
-        <ResourceLink id={enrollmentRequest.metadata.name as string} variant="full" />
+        {enrollmentRequest.metadata.name}
       </FormGroup>
       <FormGroup label={t('Labels')}>
         <LabelsField name="labels" onChangeCallback={matchLabelsOnChange} />