Fix the clipboard button as IconButton usage. (#6532)

* Fix the clipboard button as IconButton usage.

* Better fix for the ClipboardButton.

* Let the icon be passed via additional props.

* No need to explicitly pass the icon prop.

components/clipboard-button/index.js

@@ -13,6 +13,7 @@ import { Component } from '@wordpress/element';
  * Internal dependencies
  */
 import IconButton from '../icon-button';
+import Button from '../button';
 
 class ClipboardButton extends Component {
 	constructor() {
@@ -78,13 +79,15 @@ class ClipboardButton extends Component {
 		// Disable reason: Exclude from spread props passed to Button
 		// eslint-disable-next-line no-unused-vars
 		const { className, children, onCopy, onFinishCopy, text, ...buttonProps } = this.props;
+		const { icon } = buttonProps;
 		const classes = classnames( 'components-clipboard-button', className );
+		const ComponentToUse = icon ? IconButton : Button;
 
 		return (
 			<span ref={ this.bindContainer }>
-				<IconButton { ...buttonProps } icon="admin-links" className={ classes }>
+				<ComponentToUse { ...buttonProps } className={ classes }>
 					{ children }
-				</IconButton>
+				</ComponentToUse>
 			</span>
 		);
 	}

editor/components/post-permalink/index.js

@@ -72,6 +72,7 @@ class PostPermalink extends Component {
 					label={ ariaLabel }
 					onCopy={ () => this.setState( { isCopied: true } ) }
 					aria-disabled={ isCopied }
+					icon="admin-links"
 				/>
 
 				<span className="editor-post-permalink__label">{ __( 'Permalink:' ) }</span>