diff --git a/packages/block-library/src/rich-image/rich-image/icon.js b/packages/block-library/src/rich-image/rich-image/icon.js
deleted file mode 100644
index ef8691ddb78028..00000000000000
--- a/packages/block-library/src/rich-image/rich-image/icon.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export const RotateLeftIcon = () => {
-	return (
-		<SVG
-			xmlns="http://www.w3.org/2000/svg"
-			width="24"
-			height="24"
-			viewBox="0 0 24 24"
-		>
-			<Path d="M7.11 8.53L5.7 7.11C4.8 8.27 4.24 9.61 4.07 11h2.02c.14-.87.49-1.72 1.02-2.47zM6.09 13H4.07c.17 1.39.72 2.73 1.62 3.89l1.41-1.42c-.52-.75-.87-1.59-1.01-2.47zm1.01 5.32c1.16.9 2.51 1.44 3.9 1.61V17.9c-.87-.15-1.71-.49-2.46-1.03L7.1 18.32zM13 4.07V1L8.45 5.55 13 10V6.09c2.84.48 5 2.94 5 5.91s-2.16 5.43-5 5.91v2.02c3.95-.49 7-3.85 7-7.93s-3.05-7.44-7-7.93z" />
-		</SVG>
-	);
-};
-
-export const RotateRightIcon = () => {
-	return (
-		<SVG
-			xmlns="http://www.w3.org/2000/svg"
-			width="24"
-			height="24"
-			viewBox="0 0 24 24"
-		>
-			<Path d="M15.55 5.55L11 1v3.07C7.06 4.56 4 7.92 4 12s3.05 7.44 7 7.93v-2.02c-2.84-.48-5-2.94-5-5.91s2.16-5.43 5-5.91V10l4.55-4.45zM19.93 11a7.906 7.906 0 00-1.62-3.89l-1.42 1.42c.54.75.88 1.6 1.02 2.47h2.02zM13 17.9v2.02c1.39-.17 2.74-.71 3.9-1.61l-1.44-1.44c-.75.54-1.59.89-2.46 1.03zm3.89-2.42l1.42 1.41c.9-1.16 1.45-2.5 1.62-3.89h-2.02c-.14.87-.48 1.72-1.02 2.48z" />
-		</SVG>
-	);
-};
-
-export const FlipHorizontalIcon = () => {
-	return (
-		<SVG
-			xmlns="http://www.w3.org/2000/svg"
-			width="24"
-			height="24"
-			viewBox="0 0 24 24"
-		>
-			<Path d="M15 21h2v-2h-2v2zm4-12h2V7h-2v2zM3 5v14c0 1.1.9 2 2 2h4v-2H5V5h4V3H5c-1.1 0-2 .9-2 2zm16-2v2h2c0-1.1-.9-2-2-2zm-8 20h2V1h-2v22zm8-6h2v-2h-2v2zM15 5h2V3h-2v2zm4 8h2v-2h-2v2zm0 8c1.1 0 2-.9 2-2h-2v2z" />
-		</SVG>
-	);
-};
-
-export const FlipVerticalIcon = () => {
-	return (
-		<SVG
-			xmlns="http://www.w3.org/2000/svg"
-			width="24"
-			height="24"
-			viewBox="0 0 24 24"
-		>
-			<Path d="M3 15v2h2v-2H3zm12 4v2h2v-2h-2zm4-16H5c-1.1 0-2 .9-2 2v4h2V5h14v4h2V5c0-1.1-.9-2-2-2zm2 16h-2v2c1.1 0 2-.9 2-2zM1 11v2h22v-2H1zm6 8v2h2v-2H7zm12-4v2h2v-2h-2zm-8 4v2h2v-2h-2zm-8 0c0 1.1.9 2 2 2v-2H3z" />
-		</SVG>
-	);
-};
-
-export const CropIcon = () => {
-	return (
-		<SVG
-			xmlns="http://www.w3.org/2000/svg"
-			width="24"
-			height="24"
-			viewBox="0 0 24 24"
-		>
-			<Path d="M17 15h2V7c0-1.1-.9-2-2-2H9v2h8v8zM7 17V1H5v4H1v2h4v10c0 1.1.9 2 2 2h10v4h2v-4h4v-2H7z" />
-		</SVG>
-	);
-};
-
-export const AspectIcon = () => {
-	return (
-		<SVG
-			xmlns="http://www.w3.org/2000/svg"
-			width="24"
-			height="24"
-			viewBox="0 0 24 24"
-		>
-			<Path d="M19 12h-2v3h-3v2h5v-5zM7 9h3V7H5v5h2V9zm14-6H3c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h18c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16.01H3V4.99h18v14.02z" />
-		</SVG>
-	);
-};
diff --git a/packages/block-library/src/rich-image/rich-image/index.js b/packages/block-library/src/rich-image/rich-image/index.js
index ba524f5a584d4b..2f5552eb79a123 100644
--- a/packages/block-library/src/rich-image/rich-image/index.js
+++ b/packages/block-library/src/rich-image/rich-image/index.js
@@ -14,6 +14,14 @@ import {
 	__experimentalBlock as Block,
 } from '@wordpress/block-editor';
 import { Fragment, Component } from '@wordpress/element';
+import {
+	rotateLeft,
+	rotateRight,
+	flipHorizontal,
+	flipVertical,
+	crop,
+	aspectRatio,
+} from '@wordpress/icons';
 import {
 	ToolbarGroup,
 	ToolbarButton,
@@ -31,14 +39,6 @@ import { compose } from '@wordpress/compose';
  * Internal dependencies
  */
 import richImageRequest from './api';
-import {
-	RotateLeftIcon,
-	RotateRightIcon,
-	FlipHorizontalIcon,
-	FlipVerticalIcon,
-	CropIcon,
-	AspectIcon,
-} from './icon';
 
 const ROTATE_STEP = 90;
 const DEFAULT_CROP = {
@@ -102,13 +102,11 @@ class RichImage extends Component {
 	}
 
 	cropImage() {
-		const { crop } = this.state;
-
 		this.adjustImage( 'crop', {
-			cropX: crop.x,
-			cropY: crop.y,
-			cropWidth: crop.width,
-			cropHeight: crop.height,
+			cropX: this.state.crop.x,
+			cropY: this.state.crop.y,
+			cropWidth: this.state.crop.width,
+			cropHeight: this.state.crop.height,
 		} );
 	}
 
@@ -214,13 +212,13 @@ class RichImage extends Component {
 							<ToolbarItem>
 								{ ( toggleProps ) => (
 									<DropdownMenu
-										icon={ <RotateLeftIcon /> }
+										icon={ rotateLeft }
 										label={ __( 'Rotate' ) }
 										popoverProps={ POPOVER_PROPS }
 										toggleProps={ toggleProps }
 										controls={ [
 											{
-												icon: <RotateLeftIcon />,
+												icon: rotateLeft,
 												title: __( 'Rotate left' ),
 												isDisabled: inProgress,
 												onClick: () =>
@@ -232,7 +230,7 @@ class RichImage extends Component {
 													),
 											},
 											{
-												icon: <RotateRightIcon />,
+												icon: rotateRight,
 												title: __( 'Rotate right' ),
 												isDisabled: inProgress,
 												onClick: () =>
@@ -250,13 +248,13 @@ class RichImage extends Component {
 							<ToolbarItem>
 								{ ( toggleProps ) => (
 									<DropdownMenu
-										icon={ <FlipVerticalIcon /> }
+										icon={ flipVertical }
 										label={ __( 'Flip' ) }
 										popoverProps={ POPOVER_PROPS }
 										toggleProps={ toggleProps }
 										controls={ [
 											{
-												icon: <FlipVerticalIcon />,
+												icon: flipVertical,
 												title: __( 'Flip vertical' ),
 												isDisabled: inProgress,
 												onClick: () =>
@@ -265,7 +263,7 @@ class RichImage extends Component {
 													} ),
 											},
 											{
-												icon: <FlipHorizontalIcon />,
+												icon: flipHorizontal,
 												title: __( 'Flip horizontal' ),
 												isDisabled: inProgress,
 												onClick: () =>
@@ -279,7 +277,7 @@ class RichImage extends Component {
 							</ToolbarItem>
 							<ToolbarButton
 								disabled={ inProgress }
-								icon={ <CropIcon /> }
+								icon={ crop }
 								label={ __( 'Crop' ) }
 								onClick={ () =>
 									this.setState( {
@@ -296,14 +294,14 @@ class RichImage extends Component {
 					<BlockControls>
 						<ToolbarGroup>
 							<div className="richimage__crop-icon">
-								<Icon icon={ CropIcon } />
+								<Icon icon={ crop } />
 							</div>
 						</ToolbarGroup>
 						<ToolbarGroup>
 							<ToolbarItem>
 								{ ( toggleProps ) => (
 									<DropdownMenu
-										icon={ <AspectIcon /> }
+										icon={ aspectRatio }
 										label={ __( 'Aspect Ratio' ) }
 										popoverProps={ POPOVER_PROPS }
 										toggleProps={ toggleProps }