diff --git a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
index cc7d323928915..d5fe6a9eb1f76 100644
--- a/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control-linked-button/component.tsx
@@ -16,7 +16,7 @@ import { useBorderBoxControlLinkedButton } from './hook';
 import type { LinkedButtonProps } from '../types';
 
 const BorderBoxControlLinkedButton = (
-	props: WordPressComponentProps< LinkedButtonProps, 'div' >,
+	props: WordPressComponentProps< LinkedButtonProps, 'button' >,
 	forwardedRef: React.ForwardedRef< any >
 ) => {
 	const { className, isLinked, ...buttonProps } =
@@ -27,7 +27,7 @@ const BorderBoxControlLinkedButton = (
 		<Tooltip text={ label }>
 			<View className={ className }>
 				<Button
-					{ ...( buttonProps as Parameters< typeof Button >[ 0 ] ) }
+					{ ...buttonProps }
 					isSmall
 					icon={ isLinked ? link : linkOff }
 					iconSize={ 24 }
diff --git a/packages/components/src/border-box-control/border-box-control-linked-button/hook.ts b/packages/components/src/border-box-control/border-box-control-linked-button/hook.ts
index 043c101b05f5a..27ed54351aaf8 100644
--- a/packages/components/src/border-box-control/border-box-control-linked-button/hook.ts
+++ b/packages/components/src/border-box-control/border-box-control-linked-button/hook.ts
@@ -13,7 +13,7 @@ import { useCx } from '../../utils/hooks/use-cx';
 import type { LinkedButtonProps } from '../types';
 
 export function useBorderBoxControlLinkedButton(
-	props: WordPressComponentProps< LinkedButtonProps, 'div' >
+	props: WordPressComponentProps< LinkedButtonProps, 'button' >
 ) {
 	const {
 		className,
diff --git a/packages/components/src/button/deprecated.tsx b/packages/components/src/button/deprecated.tsx
index 7acd6da33a298..5d39e53c1008c 100644
--- a/packages/components/src/button/deprecated.tsx
+++ b/packages/components/src/button/deprecated.tsx
@@ -13,8 +13,7 @@ import { forwardRef } from '@wordpress/element';
  * Internal dependencies
  */
 import Button from '.';
-import type { ButtonProps, DeprecatedIconButtonProps, TagName } from './types';
-import type { WordPressComponentProps } from '../ui/context';
+import type { DeprecatedIconButtonProps } from './types';
 
 function UnforwardedIconButton(
 	{
diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
index 4ad82fb607a1f..c087d65b8c925 100644
--- a/packages/components/src/button/index.tsx
+++ b/packages/components/src/button/index.tsx
@@ -18,17 +18,9 @@ import Tooltip from '../tooltip';
 import Icon from '../icon';
 import { VisuallyHidden } from '../visually-hidden';
 import type { WordPressComponentProps } from '../ui/context';
-import type {
-	ButtonProps,
-	DeprecatedButtonProps,
-	DisabledEvent,
-	TagName,
-} from './types';
+import type { ButtonProps, DeprecatedButtonProps, TagName } from './types';
 
-const disabledEventsOnDisabledButton = [
-	'onMouseDown',
-	'onClick',
-] as const;
+const disabledEventsOnDisabledButton = [ 'onMouseDown', 'onClick' ] as const;
 
 function useDeprecatedProps( {
 	isDefault,
diff --git a/packages/components/src/button/types.ts b/packages/components/src/button/types.ts
index b66d85d11961e..18238c7e2e829 100644
--- a/packages/components/src/button/types.ts
+++ b/packages/components/src/button/types.ts
@@ -7,6 +7,7 @@ import type { ReactNode } from 'react';
  * Internal dependencies
  */
 import type { Props as IconProps } from '../icon';
+import type { PopoverProps } from '../popover/types';
 
 export type ButtonProps = {
 	/**