diff --git a/packages/block-library/src/post-content/index.js b/packages/block-library/src/post-content/index.js
index f1f30b153aff9a..343b3bcf0810c0 100644
--- a/packages/block-library/src/post-content/index.js
+++ b/packages/block-library/src/post-content/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { alignJustify as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import metadata from './block.json';
-import icon from './icon';
import edit from './edit';
const { name } = metadata;
diff --git a/packages/block-library/src/post-title/index.js b/packages/block-library/src/post-title/index.js
index d2504dbc1b4cf8..3339c55bd89d01 100644
--- a/packages/block-library/src/post-title/index.js
+++ b/packages/block-library/src/post-title/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { title as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import metadata from './block.json';
-import icon from './icon';
import edit from './edit';
const { name } = metadata;
diff --git a/packages/block-library/src/preformatted/icon.js b/packages/block-library/src/preformatted/icon.js
deleted file mode 100644
index 2ece9106140a89..00000000000000
--- a/packages/block-library/src/preformatted/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, Rect, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/preformatted/index.js b/packages/block-library/src/preformatted/index.js
index 1b897ce2c87791..2acd8d99bd0062 100644
--- a/packages/block-library/src/preformatted/index.js
+++ b/packages/block-library/src/preformatted/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { preformatted as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
import transforms from './transforms';
diff --git a/packages/block-library/src/pullquote/icon.js b/packages/block-library/src/pullquote/icon.js
deleted file mode 100644
index f8200535b79612..00000000000000
--- a/packages/block-library/src/pullquote/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, Polygon, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/pullquote/index.js b/packages/block-library/src/pullquote/index.js
index 220b7bc2d0cc84..98120582530911 100644
--- a/packages/block-library/src/pullquote/index.js
+++ b/packages/block-library/src/pullquote/index.js
@@ -2,6 +2,7 @@
* WordPress dependencies
*/
import { __, _x } from '@wordpress/i18n';
+import { pullquote as icon } from '@wordpress/icons';
/**
* Internal dependencies
@@ -9,7 +10,6 @@ import { __, _x } from '@wordpress/i18n';
import { SOLID_COLOR_STYLE_NAME } from './shared';
import deprecated from './deprecated';
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
diff --git a/packages/block-library/src/quote/icon.js b/packages/block-library/src/quote/icon.js
deleted file mode 100644
index 22de4ef2da181e..00000000000000
--- a/packages/block-library/src/quote/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/quote/index.js b/packages/block-library/src/quote/index.js
index e7d733d41e3d1f..f38b1bbb48c33f 100644
--- a/packages/block-library/src/quote/index.js
+++ b/packages/block-library/src/quote/index.js
@@ -2,13 +2,13 @@
* WordPress dependencies
*/
import { __, _x } from '@wordpress/i18n';
+import { quote as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import deprecated from './deprecated';
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
import transforms from './transforms';
diff --git a/packages/block-library/src/separator/icon.js b/packages/block-library/src/separator/icon.js
deleted file mode 100644
index 3fcea1436545b1..00000000000000
--- a/packages/block-library/src/separator/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/separator/index.js b/packages/block-library/src/separator/index.js
index 37948d1d727ae6..23f1d47505e8fa 100644
--- a/packages/block-library/src/separator/index.js
+++ b/packages/block-library/src/separator/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { separator as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
import transforms from './transforms';
diff --git a/packages/block-library/src/shortcode/icon.js b/packages/block-library/src/shortcode/icon.js
deleted file mode 100644
index b60538f3976290..00000000000000
--- a/packages/block-library/src/shortcode/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/shortcode/index.js b/packages/block-library/src/shortcode/index.js
index 69dc9a0dcd2647..efc7ca93e5a4e3 100644
--- a/packages/block-library/src/shortcode/index.js
+++ b/packages/block-library/src/shortcode/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { shortcode as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import edit from './edit';
-import icon from './icon';
import save from './save';
import transforms from './transforms';
import metadata from './block.json';
diff --git a/packages/block-library/src/site-title/index.js b/packages/block-library/src/site-title/index.js
index a744038f505be1..b2d6486556df57 100644
--- a/packages/block-library/src/site-title/index.js
+++ b/packages/block-library/src/site-title/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { mapMarker as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import metadata from './block.json';
-import icon from './icon';
import edit from './edit';
const { name } = metadata;
diff --git a/packages/block-library/src/spacer/icon.js b/packages/block-library/src/spacer/icon.js
deleted file mode 100644
index d16b440f7d556a..00000000000000
--- a/packages/block-library/src/spacer/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { G, Path, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/spacer/index.js b/packages/block-library/src/spacer/index.js
index 09eb2e40c5c907..374e096c104e3d 100644
--- a/packages/block-library/src/spacer/index.js
+++ b/packages/block-library/src/spacer/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { resizeCornerNE as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
diff --git a/packages/block-library/src/subhead/icon.js b/packages/block-library/src/subhead/icon.js
deleted file mode 100644
index cbc71f6a325d03..00000000000000
--- a/packages/block-library/src/subhead/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/subhead/index.js b/packages/block-library/src/subhead/index.js
index e15a7c16a8a8df..936bc5b6117e77 100644
--- a/packages/block-library/src/subhead/index.js
+++ b/packages/block-library/src/subhead/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { SVG, Path } from '@wordpress/components';
/**
* Internal dependencies
*/
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
import transforms from './transforms';
@@ -19,7 +19,11 @@ export { metadata, name };
export const settings = {
title: __( 'Subheading (deprecated)' ),
description: __( 'This block is deprecated. Please use the Paragraph block instead.' ),
- icon,
+ icon: (
+
+ ),
supports: {
// Hide from inserter as this block is deprecated.
inserter: false,
diff --git a/packages/block-library/src/table/edit.js b/packages/block-library/src/table/edit.js
index 33acdac13e8836..0310893801540b 100644
--- a/packages/block-library/src/table/edit.js
+++ b/packages/block-library/src/table/edit.js
@@ -26,6 +26,7 @@ import {
ToggleControl,
ToolbarGroup,
} from '@wordpress/components';
+import { table as icon } from '@wordpress/icons';
/**
* Internal dependencies
@@ -41,7 +42,6 @@ import {
toggleSection,
isEmptyTableSection,
} from './state';
-import icon from './icon';
const BACKGROUND_COLORS = [
{
diff --git a/packages/block-library/src/table/icon.js b/packages/block-library/src/table/icon.js
deleted file mode 100644
index 0292142033cf2c..00000000000000
--- a/packages/block-library/src/table/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { G, Path, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/table/index.js b/packages/block-library/src/table/index.js
index cb4e69f1988fef..f755a7f05de6fb 100644
--- a/packages/block-library/src/table/index.js
+++ b/packages/block-library/src/table/index.js
@@ -2,13 +2,13 @@
* WordPress dependencies
*/
import { __, _x } from '@wordpress/i18n';
+import { table as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import deprecated from './deprecated';
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
import transforms from './transforms';
diff --git a/packages/block-library/src/verse/icon.js b/packages/block-library/src/verse/icon.js
deleted file mode 100644
index 4e665bdaa68e0a..00000000000000
--- a/packages/block-library/src/verse/icon.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export default (
-
-);
diff --git a/packages/block-library/src/verse/index.js b/packages/block-library/src/verse/index.js
index 98d617b2faa3f0..ca11d71bc89ee8 100644
--- a/packages/block-library/src/verse/index.js
+++ b/packages/block-library/src/verse/index.js
@@ -2,13 +2,13 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { verse as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import deprecated from './deprecated';
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
import transforms from './transforms';
diff --git a/packages/block-library/src/video/edit.js b/packages/block-library/src/video/edit.js
index 5dbc2945b363fa..a0eaf5dcb76fa9 100644
--- a/packages/block-library/src/video/edit.js
+++ b/packages/block-library/src/video/edit.js
@@ -31,12 +31,12 @@ import {
import {
withSelect,
} from '@wordpress/data';
+import { video as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import { createUpgradedEmbedBlock } from '../embed/util';
-import icon from './icon';
import VideoCommonSettings from './edit-common-settings';
const ALLOWED_MEDIA_TYPES = [ 'video' ];
diff --git a/packages/block-library/src/video/edit.native.js b/packages/block-library/src/video/edit.native.js
index ee8e7b8070e354..6d9f76c109634e 100644
--- a/packages/block-library/src/video/edit.native.js
+++ b/packages/block-library/src/video/edit.native.js
@@ -38,12 +38,12 @@ import {
import { __, sprintf } from '@wordpress/i18n';
import { isURL } from '@wordpress/url';
import { doAction, hasAction } from '@wordpress/hooks';
+import { video as SvgIcon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import style from './style.scss';
-import SvgIcon from './icon';
import SvgIconRetry from './icon-retry';
import VideoCommonSettings from './edit-common-settings';
diff --git a/packages/block-library/src/video/icon.js b/packages/block-library/src/video/icon.js
deleted file mode 100644
index 8c43e80279f78f..00000000000000
--- a/packages/block-library/src/video/icon.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { Path, SVG } from '@wordpress/components';
-
-export default ;
-
diff --git a/packages/block-library/src/video/index.js b/packages/block-library/src/video/index.js
index 083968558497b0..b7997c1f4438ef 100644
--- a/packages/block-library/src/video/index.js
+++ b/packages/block-library/src/video/index.js
@@ -2,12 +2,12 @@
* WordPress dependencies
*/
import { __ } from '@wordpress/i18n';
+import { video as icon } from '@wordpress/icons';
/**
* Internal dependencies
*/
import edit from './edit';
-import icon from './icon';
import metadata from './block.json';
import save from './save';
import transforms from './transforms';
diff --git a/packages/icons/src/index.js b/packages/icons/src/index.js
index ff6d9ce82f3783..c1f96cc94b7ee5 100644
--- a/packages/icons/src/index.js
+++ b/packages/icons/src/index.js
@@ -1,5 +1,6 @@
export { default as Icon } from './icon';
+export { default as alignJustify } from './library/align-justify';
export { default as archive } from './library/archive';
export { default as audio } from './library/audio';
export { default as button } from './library/button';
@@ -18,9 +19,20 @@ export { default as group } from './library/group';
export { default as html } from './library/html';
export { default as image } from './library/image';
export { default as list } from './library/list';
+export { default as mapMarker } from './library/map-marker';
export { default as mediaAndText } from './library/media-and-text';
export { default as more } from './library/more';
export { default as pageBreak } from './library/page-break';
export { default as paragraph } from './library/paragraph';
export { default as postList } from './library/post-list';
+export { default as preformatted } from './library/preformatted';
+export { default as pullquote } from './library/pullquote';
+export { default as quote } from './library/quote';
+export { default as resizeCornerNE } from './library/resize-corner-n-e';
+export { default as separator } from './library/separator';
+export { default as shortcode } from './library/shortcode';
+export { default as table } from './library/table';
+export { default as title } from './library/title';
+export { default as verse } from './library/verse';
+export { default as video } from './library/video';
export { default as widget } from './library/widget';
diff --git a/packages/block-library/src/post-content/icon.js b/packages/icons/src/library/align-justify.js
similarity index 62%
rename from packages/block-library/src/post-content/icon.js
rename to packages/icons/src/library/align-justify.js
index 2cd26e9d5f5a31..f6f9a3a47e4a9d 100644
--- a/packages/block-library/src/post-content/icon.js
+++ b/packages/icons/src/library/align-justify.js
@@ -1,11 +1,12 @@
/**
* WordPress dependencies
*/
-import { SVG, Path } from '@wordpress/components';
+import { SVG, Path } from '@wordpress/primitives';
-export default (
+const alignJustify = (
);
+
+export default alignJustify;
diff --git a/packages/icons/src/library/check.js b/packages/icons/src/library/check.js
index 7cdb17f1661150..fd048ca0739449 100644
--- a/packages/icons/src/library/check.js
+++ b/packages/icons/src/library/check.js
@@ -3,11 +3,11 @@
*/
import { SVG, Path } from '@wordpress/primitives';
-const saved = (
+const check = (
);
-export default saved;
+export default check;
diff --git a/packages/block-library/src/site-title/icon.js b/packages/icons/src/library/map-marker.js
similarity index 72%
rename from packages/block-library/src/site-title/icon.js
rename to packages/icons/src/library/map-marker.js
index 1ab74dec2c32d3..7b7d43e0f25e82 100644
--- a/packages/block-library/src/site-title/icon.js
+++ b/packages/icons/src/library/map-marker.js
@@ -1,12 +1,13 @@
/**
* WordPress dependencies
*/
-import { SVG, Path, Circle } from '@wordpress/components';
+import { SVG, Path, Circle } from '@wordpress/primitives';
-export default (
+const mapMarker = (
);
+
+export default mapMarker;
diff --git a/packages/icons/src/library/preformatted.js b/packages/icons/src/library/preformatted.js
new file mode 100644
index 00000000000000..789ef2fea73e14
--- /dev/null
+++ b/packages/icons/src/library/preformatted.js
@@ -0,0 +1,16 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, Rect, SVG } from '@wordpress/primitives';
+
+const preformatted = (
+
+);
+
+export default preformatted;
diff --git a/packages/icons/src/library/pullquote.js b/packages/icons/src/library/pullquote.js
new file mode 100644
index 00000000000000..8c4f41b30f4a0a
--- /dev/null
+++ b/packages/icons/src/library/pullquote.js
@@ -0,0 +1,14 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, Polygon, SVG } from '@wordpress/primitives';
+
+const pullquote = (
+
+);
+
+export default pullquote;
diff --git a/packages/icons/src/library/quote.js b/packages/icons/src/library/quote.js
new file mode 100644
index 00000000000000..ce393a5a3aa077
--- /dev/null
+++ b/packages/icons/src/library/quote.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const quote = (
+
+);
+
+export default quote;
diff --git a/packages/icons/src/library/resize-corner-n-e.js b/packages/icons/src/library/resize-corner-n-e.js
new file mode 100644
index 00000000000000..d8291689cd0ba2
--- /dev/null
+++ b/packages/icons/src/library/resize-corner-n-e.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const resizeCornerNE = (
+
+);
+
+export default resizeCornerNE;
diff --git a/packages/icons/src/library/separator.js b/packages/icons/src/library/separator.js
new file mode 100644
index 00000000000000..eeb42159401e91
--- /dev/null
+++ b/packages/icons/src/library/separator.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const separator = (
+
+);
+
+export default separator;
diff --git a/packages/icons/src/library/shortcode.js b/packages/icons/src/library/shortcode.js
new file mode 100644
index 00000000000000..16c0ffbae6c2b0
--- /dev/null
+++ b/packages/icons/src/library/shortcode.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const shortcode = (
+
+);
+
+export default shortcode;
diff --git a/packages/icons/src/library/table.js b/packages/icons/src/library/table.js
new file mode 100644
index 00000000000000..788fe5d3eef19e
--- /dev/null
+++ b/packages/icons/src/library/table.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const table = (
+
+);
+
+export default table;
diff --git a/packages/block-library/src/post-title/icon.js b/packages/icons/src/library/title.js
similarity index 57%
rename from packages/block-library/src/post-title/icon.js
rename to packages/icons/src/library/title.js
index 6dc60909619f82..3eae5dc389d0ac 100644
--- a/packages/block-library/src/post-title/icon.js
+++ b/packages/icons/src/library/title.js
@@ -1,11 +1,12 @@
/**
* WordPress dependencies
*/
-import { SVG, Path } from '@wordpress/components';
+import { SVG, Path } from '@wordpress/primitives';
-export default (
+const title = (
);
+
+export default title;
diff --git a/packages/icons/src/library/verse.js b/packages/icons/src/library/verse.js
new file mode 100644
index 00000000000000..8fcde1629341cb
--- /dev/null
+++ b/packages/icons/src/library/verse.js
@@ -0,0 +1,12 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const verse = (
+
+);
+
+export default verse;
diff --git a/packages/icons/src/library/video.js b/packages/icons/src/library/video.js
new file mode 100644
index 00000000000000..38be9ecfef2a4c
--- /dev/null
+++ b/packages/icons/src/library/video.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { Path, SVG } from '@wordpress/primitives';
+
+const video = (
+
+);
+
+export default video;
+