diff --git a/public/app/features/alerting/unified/Receivers.test.tsx b/public/app/features/alerting/unified/Receivers.test.tsx
index 5058856159d..389c5c06c29 100644
--- a/public/app/features/alerting/unified/Receivers.test.tsx
+++ b/public/app/features/alerting/unified/Receivers.test.tsx
@@ -24,6 +24,7 @@ import store from 'app/core/store';
 import { contextSrv } from 'app/core/services/context_srv';
 import { selectOptionInTest } from '@grafana/ui';
 import { AlertManagerDataSourceJsonData, AlertManagerImplementation } from 'app/plugins/datasource/alertmanager/types';
+import { interceptLinkClicks } from 'app/core/navigation/patch/interceptLinkClicks';
 
 jest.mock('./api/alertmanager');
 jest.mock('./api/grafana');
@@ -116,6 +117,8 @@ const clickSelectOption = async (selectElement: HTMLElement, optionText: string)
   await selectOptionInTest(selectElement, optionText);
 };
 
+document.addEventListener('click', interceptLinkClicks);
+
 describe('Receivers', () => {
   beforeEach(() => {
     jest.resetAllMocks();
@@ -404,11 +407,12 @@ describe('Receivers', () => {
     const receiverRows = receiversTable.querySelectorAll<HTMLTableRowElement>('tbody tr');
     expect(receiverRows[0]).toHaveTextContent('cloud-receiver');
     expect(byTestId('edit').query(receiverRows[0])).not.toBeInTheDocument();
-    await userEvent.click(byTestId('view').get(receiverRows[0]));
+    userEvent.click(byTestId('view').get(receiverRows[0]));
 
     // check that form is open
     await byRole('heading', { name: /contact point/i }).find();
     expect(locationService.getLocation().pathname).toEqual('/alerting/notifications/receivers/cloud-receiver/edit');
+
     const channelForms = ui.channelFormContainer.queryAll();
     expect(channelForms).toHaveLength(2);
 
diff --git a/public/app/features/alerting/unified/components/rules/ActionIcon.tsx b/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
index d38406a105a..e8000c98a88 100644
--- a/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
+++ b/public/app/features/alerting/unified/components/rules/ActionIcon.tsx
@@ -1,18 +1,15 @@
-import { Icon, IconName, useStyles, Tooltip } from '@grafana/ui';
+import { IconName, Tooltip, LinkButton, Button } from '@grafana/ui';
 import { PopoverContent, TooltipPlacement } from '@grafana/ui/src/components/Tooltip';
 import React, { FC } from 'react';
-import { css, cx } from '@emotion/css';
-import { Link } from 'react-router-dom';
 
 interface Props {
   tooltip: PopoverContent;
   icon: IconName;
-
   className?: string;
   tooltipPlacement?: TooltipPlacement;
   to?: string;
   target?: string;
-  onClick?: (e: React.MouseEvent<HTMLDivElement, MouseEvent>) => void;
+  onClick?: () => void;
   'data-testid'?: string;
 }
 
@@ -27,53 +24,33 @@ export const ActionIcon: FC<Props> = ({
   ...rest
 }) => {
   const ariaLabel = typeof tooltip === 'string' ? tooltip : undefined;
-  const iconEl = (
-    <Icon
-      role="button"
-      className={cx(useStyles(getStyle), className)}
-      onClick={onClick}
-      name={icon}
-      {...rest}
-      aria-label={ariaLabel}
-    />
-  );
 
   return (
     <Tooltip content={tooltip} placement={tooltipPlacement}>
       {to ? (
-        <GoTo url={to} label={ariaLabel} target={target}>
-          {iconEl}
-        </GoTo>
+        <LinkButton
+          variant="secondary"
+          fill="text"
+          icon={icon}
+          href={to}
+          size="sm"
+          target={target}
+          {...rest}
+          aria-label={ariaLabel}
+        />
       ) : (
-        iconEl
+        <Button
+          className={className}
+          variant="secondary"
+          fill="text"
+          size="sm"
+          icon={icon}
+          type="button"
+          onClick={onClick}
+          {...rest}
+          aria-label={ariaLabel}
+        />
       )}
     </Tooltip>
   );
 };
-
-interface GoToProps {
-  url: string;
-  label?: string;
-  target?: string;
-  children?: React.ReactNode;
-}
-
-const GoTo = React.forwardRef<HTMLAnchorElement, GoToProps>(({ url, label, target, children }, ref) => {
-  const absoluteUrl = url?.startsWith('http');
-
-  return absoluteUrl ? (
-    <a ref={ref} aria-label={label} href={url} target={target}>
-      {children}
-    </a>
-  ) : (
-    <Link ref={ref} aria-label={label} to={url} target={target}>
-      {children}
-    </Link>
-  );
-});
-
-GoTo.displayName = 'GoTo';
-
-export const getStyle = () => css`
-  cursor: pointer;
-`;
diff --git a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
index b5237649c03..ab267eeb172 100644
--- a/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
+++ b/public/app/features/alerting/unified/components/rules/RulesGroup.tsx
@@ -191,7 +191,7 @@ export const getStyles = (theme: GrafanaTheme2) => ({
   `,
   actionIcons: css`
     & > * + * {
-      margin-left: ${theme.spacing(1)};
+      margin-left: ${theme.spacing(0.5)};
     }
   `,
   rulesTable: css`
diff --git a/public/app/features/alerting/unified/styles/table.ts b/public/app/features/alerting/unified/styles/table.ts
index 707bdb0cd47..8994219683e 100644
--- a/public/app/features/alerting/unified/styles/table.ts
+++ b/public/app/features/alerting/unified/styles/table.ts
@@ -32,7 +32,7 @@ export const getAlertTableStyles = (theme: GrafanaTheme2) => ({
     white-space: nowrap;
 
     & > * + * {
-      margin-left: ${theme.spacing(1)};
+      margin-left: ${theme.spacing(0.5)};
     }
   `,
 });