diff --git a/packages/block-editor/src/components/alignment-toolbar/index.js b/packages/block-editor/src/components/alignment-toolbar/index.js
index 40dfa28c0ce88..0f7ac41953dd9 100644
--- a/packages/block-editor/src/components/alignment-toolbar/index.js
+++ b/packages/block-editor/src/components/alignment-toolbar/index.js
@@ -8,21 +8,21 @@ import { find } from 'lodash';
  */
 import { __ } from '@wordpress/i18n';
 import { Toolbar } from '@wordpress/components';
-import { alignLeft, alignRight, alignCenter } from '@wordpress/icons';
+import { textAlignLeft, textAlignRight, textAlignCenter } from '@wordpress/icons';
 
 const DEFAULT_ALIGNMENT_CONTROLS = [
 	{
-		icon: alignLeft,
+		icon: textAlignLeft,
 		title: __( 'Align text left' ),
 		align: 'left',
 	},
 	{
-		icon: alignCenter,
+		icon: textAlignCenter,
 		title: __( 'Align text center' ),
 		align: 'center',
 	},
 	{
-		icon: alignRight,
+		icon: textAlignRight,
 		title: __( 'Align text right' ),
 		align: 'right',
 	},
diff --git a/packages/block-editor/src/components/block-alignment-toolbar/index.js b/packages/block-editor/src/components/block-alignment-toolbar/index.js
index 2f559c5f94602..b3ac1df33142c 100644
--- a/packages/block-editor/src/components/block-alignment-toolbar/index.js
+++ b/packages/block-editor/src/components/block-alignment-toolbar/index.js
@@ -6,11 +6,11 @@ import { Toolbar } from '@wordpress/components';
 import { withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 import {
-	alignBlockCenter,
-	alignBlockFullWidth,
-	alignBlockLeft,
-	alignBlockRight,
-	alignBlockWide,
+	positionCenter,
+	positionLeft,
+	positionRight,
+	stretchFullWidth,
+	stretchWide,
 } from '@wordpress/icons';
 
 /**
@@ -20,23 +20,23 @@ import { withBlockEditContext } from '../block-edit/context';
 
 const BLOCK_ALIGNMENTS_CONTROLS = {
 	left: {
-		icon: alignBlockLeft,
+		icon: positionLeft,
 		title: __( 'Align left' ),
 	},
 	center: {
-		icon: alignBlockCenter,
+		icon: positionCenter,
 		title: __( 'Align center' ),
 	},
 	right: {
-		icon: alignBlockRight,
+		icon: positionRight,
 		title: __( 'Align right' ),
 	},
 	wide: {
-		icon: alignBlockWide,
+		icon: stretchWide,
 		title: __( 'Wide width' ),
 	},
 	full: {
-		icon: alignBlockFullWidth,
+		icon: stretchFullWidth,
 		title: __( 'Full width' ),
 	},
 };
@@ -50,9 +50,9 @@ export function BlockAlignmentToolbar( { value, onChange, controls = DEFAULT_CON
 		return () => onChange( value === align ? undefined : align );
 	}
 
-	const enabledControls = wideControlsEnabled ?
-		controls :
-		controls.filter( ( control ) => WIDE_CONTROLS.indexOf( control ) === -1 );
+	const enabledControls = wideControlsEnabled
+		? controls
+		: controls.filter( ( control ) => WIDE_CONTROLS.indexOf( control ) === -1 );
 
 	const activeAlignmentControl = BLOCK_ALIGNMENTS_CONTROLS[ value ];
 	const defaultAlignmentControl = BLOCK_ALIGNMENTS_CONTROLS[ DEFAULT_CONTROL ];
diff --git a/packages/block-library/src/post-content/index.js b/packages/block-library/src/post-content/index.js
index 343b3bcf0810c..af78e3cb34550 100644
--- a/packages/block-library/src/post-content/index.js
+++ b/packages/block-library/src/post-content/index.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { alignJustify as icon } from '@wordpress/icons';
+import { textAlignJustify as icon } from '@wordpress/icons';
 
 /**
  * Internal dependencies
diff --git a/packages/block-library/src/table/edit.js b/packages/block-library/src/table/edit.js
index 33c0966e8376a..38d11503099f4 100644
--- a/packages/block-library/src/table/edit.js
+++ b/packages/block-library/src/table/edit.js
@@ -26,7 +26,7 @@ import {
 	ToggleControl,
 	ToolbarGroup,
 } from '@wordpress/components';
-import { table as icon, alignLeft, alignRight, alignCenter } from '@wordpress/icons';
+import { table as icon, textAlignLeft, textAlignRight, textAlignCenter } from '@wordpress/icons';
 
 /**
  * Internal dependencies
@@ -68,17 +68,17 @@ const BACKGROUND_COLORS = [
 
 const ALIGNMENT_CONTROLS = [
 	{
-		icon: alignLeft,
+		icon: textAlignLeft,
 		title: __( 'Align Column Left' ),
 		align: 'left',
 	},
 	{
-		icon: alignCenter,
+		icon: textAlignCenter,
 		title: __( 'Align Column Center' ),
 		align: 'center',
 	},
 	{
-		icon: alignRight,
+		icon: textAlignRight,
 		title: __( 'Align Column Right' ),
 		align: 'right',
 	},
diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js
index f2d135eb9ae8a..96b6f0cc3514d 100644
--- a/packages/icons/src/index.js
+++ b/packages/icons/src/index.js
@@ -1,14 +1,5 @@
 export { default as Icon } from './icon';
 
-export { default as alignBlockCenter } from './library/align-block-center';
-export { default as alignBlockFullWidth } from './library/align-block-full-width';
-export { default as alignBlockLeft } from './library/align-block-left';
-export { default as alignBlockRight } from './library/align-block-right';
-export { default as alignBlockWide } from './library/align-block-wide';
-export { default as alignCenter } from './library/align-center';
-export { default as alignJustify } from './library/align-justify';
-export { default as alignLeft } from './library/align-left';
-export { default as alignRight } from './library/align-right';
 export { default as archive } from './library/archive';
 export { default as audio } from './library/audio';
 export { default as button } from './library/button';
@@ -37,6 +28,9 @@ export { default as more } from './library/more';
 export { default as navigation } from './library/navigation';
 export { default as pageBreak } from './library/page-break';
 export { default as paragraph } from './library/paragraph';
+export { default as positionCenter } from './library/position-center';
+export { default as positionLeft } from './library/position-left';
+export { default as positionRight } from './library/position-right';
 export { default as plusCircle } from './library/plus-circle';
 export { default as postList } from './library/post-list';
 export { default as preformatted } from './library/preformatted';
@@ -47,8 +41,14 @@ export { default as rss } from './library/rss';
 export { default as search } from './library/search';
 export { default as separator } from './library/separator';
 export { default as shortcode } from './library/shortcode';
+export { default as stretchFullWidth } from './library/stretch-full-width';
+export { default as stretchWide } from './library/stretch-wide';
 export { default as table } from './library/table';
 export { default as tag } from './library/tag';
+export { default as textAlignCenter } from './library/text-align-center';
+export { default as textAlignJustify } from './library/text-align-justify';
+export { default as textAlignLeft } from './library/text-align-left';
+export { default as textAlignRight } from './library/text-align-right';
 export { default as title } from './library/title';
 export { default as trash } from './library/trash';
 export { default as verse } from './library/verse';
diff --git a/packages/icons/src/library/align-block-center.js b/packages/icons/src/library/position-center.js
similarity index 78%
rename from packages/icons/src/library/align-block-center.js
rename to packages/icons/src/library/position-center.js
index 8a19846a797d8..029f1f4a9aaca 100644
--- a/packages/icons/src/library/align-block-center.js
+++ b/packages/icons/src/library/position-center.js
@@ -4,10 +4,10 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignBlockCenter = (
+const positionCenter = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M3 5h14V3H3v2zm12 8V7H5v6h10zM3 17h14v-2H3v2z" />
 	</SVG>
 );
 
-export default alignBlockCenter;
+export default positionCenter;
diff --git a/packages/icons/src/library/align-block-left.js b/packages/icons/src/library/position-left.js
similarity index 81%
rename from packages/icons/src/library/align-block-left.js
rename to packages/icons/src/library/position-left.js
index 0ef35aedf0199..6a79937e30b7f 100644
--- a/packages/icons/src/library/align-block-left.js
+++ b/packages/icons/src/library/position-left.js
@@ -4,10 +4,10 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignBlockLeft = (
+const positionLeft = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M3 5h14V3H3v2zm9 8V7H3v6h9zm2-4h3V7h-3v2zm0 4h3v-2h-3v2zM3 17h14v-2H3v2z" />
 	</SVG>
 );
 
-export default alignBlockLeft;
+export default positionLeft;
diff --git a/packages/icons/src/library/align-block-right.js b/packages/icons/src/library/position-right.js
similarity index 81%
rename from packages/icons/src/library/align-block-right.js
rename to packages/icons/src/library/position-right.js
index 226738aa63f64..d591826569692 100644
--- a/packages/icons/src/library/align-block-right.js
+++ b/packages/icons/src/library/position-right.js
@@ -4,10 +4,10 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignBlockRight = (
+const positionRight = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M3 5h14V3H3v2zm0 4h3V7H3v2zm14 4V7H8v6h9zM3 13h3v-2H3v2zm0 4h14v-2H3v2z" />
 	</SVG>
 );
 
-export default alignBlockRight;
+export default positionRight;
diff --git a/packages/icons/src/library/align-block-full-width.js b/packages/icons/src/library/stretch-full-width.js
similarity index 76%
rename from packages/icons/src/library/align-block-full-width.js
rename to packages/icons/src/library/stretch-full-width.js
index 6178c2682bfe5..e27b0ab2c2eee 100644
--- a/packages/icons/src/library/align-block-full-width.js
+++ b/packages/icons/src/library/stretch-full-width.js
@@ -4,10 +4,10 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignBlockFullWidth = (
+const stretchFullWidth = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M17 13V3H3v10h14zM5 17h10v-2H5v2z" />
 	</SVG>
 );
 
-export default alignBlockFullWidth;
+export default stretchFullWidth;
diff --git a/packages/icons/src/library/align-block-wide.js b/packages/icons/src/library/stretch-wide.js
similarity index 80%
rename from packages/icons/src/library/align-block-wide.js
rename to packages/icons/src/library/stretch-wide.js
index 71b434627d53f..6bdda30ede996 100644
--- a/packages/icons/src/library/align-block-wide.js
+++ b/packages/icons/src/library/stretch-wide.js
@@ -4,10 +4,10 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignBlockWide = (
+const stretchWide = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M5 5h10V3H5v2zm12 8V7H3v6h14zM5 17h10v-2H5v2z" />
 	</SVG>
 );
 
-export default alignBlockWide;
+export default stretchWide;
diff --git a/packages/icons/src/library/align-center.js b/packages/icons/src/library/text-align-center.js
similarity index 80%
rename from packages/icons/src/library/align-center.js
rename to packages/icons/src/library/text-align-center.js
index 4b95f643d1061..6e942e24598a5 100644
--- a/packages/icons/src/library/align-center.js
+++ b/packages/icons/src/library/text-align-center.js
@@ -3,11 +3,11 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignCenter = (
+const textAlignCenter = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M14 5V3H6v2h8zm3 4V7H3v2h14zm-3 4v-2H6v2h8zm3 4v-2H3v2h14z" />
 	</SVG>
 );
 
-export default alignCenter;
+export default textAlignCenter;
 
diff --git a/packages/icons/src/library/align-justify.js b/packages/icons/src/library/text-align-justify.js
similarity index 79%
rename from packages/icons/src/library/align-justify.js
rename to packages/icons/src/library/text-align-justify.js
index f6f9a3a47e4a9..fe641e91a0925 100644
--- a/packages/icons/src/library/align-justify.js
+++ b/packages/icons/src/library/text-align-justify.js
@@ -3,10 +3,10 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignJustify = (
+const textAlignJustify = (
 	<SVG xmlns="https://www.w3.org/2000/svg" viewBox="0 0 24 24">
 		<Path d="M3 15h18v-2H3v2zm0 4h18v-2H3v2zm0-8h18V9H3v2zm0-6v2h18V5H3z" />
 	</SVG>
 );
 
-export default alignJustify;
+export default textAlignJustify;
diff --git a/packages/icons/src/library/align-left.js b/packages/icons/src/library/text-align-left.js
similarity index 81%
rename from packages/icons/src/library/align-left.js
rename to packages/icons/src/library/text-align-left.js
index a34551b910bcf..1cc8b911b54a1 100644
--- a/packages/icons/src/library/align-left.js
+++ b/packages/icons/src/library/text-align-left.js
@@ -3,11 +3,11 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignLeft = (
+const textAlignLeft = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M12 5V3H3v2h9zm5 4V7H3v2h14zm-5 4v-2H3v2h9zm5 4v-2H3v2h14z" />
 	</SVG>
 );
 
-export default alignLeft;
+export default textAlignLeft;
 
diff --git a/packages/icons/src/library/align-right.js b/packages/icons/src/library/text-align-right.js
similarity index 80%
rename from packages/icons/src/library/align-right.js
rename to packages/icons/src/library/text-align-right.js
index 9398e65c030d9..814ef62550fb5 100644
--- a/packages/icons/src/library/align-right.js
+++ b/packages/icons/src/library/text-align-right.js
@@ -3,11 +3,11 @@
  */
 import { SVG, Path } from '@wordpress/primitives';
 
-const alignRight = (
+const textAlignRight = (
 	<SVG xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 24 24">
 		<Path d="M17 5V3H8v2h9zm0 4V7H3v2h14zm0 4v-2H8v2h9zm0 4v-2H3v2h14z" />
 	</SVG>
 );
 
-export default alignRight;
+export default textAlignRight;