diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e6b712fd44..3067c156b3b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
- Tweaked `SuperDatePicker` to make the start/end date selection more obvious ([#2049](https://github.com/elastic/eui/pull/2049))
- Added `toSentenceCase` string service ([#2049](https://github.com/elastic/eui/pull/2049))
- Pass `EuiSuperSelect`'s `popoverClassName` to the popover's panel ([#2068](https://github.com/elastic/eui/pull/2068))
+- Added `editorItemAlignLeft`, `editorItemAlignCenter`, `editorItemRight`, `editorItemAlignTop`, `editorItemAlignMiddle`, `editorItemAlignBottom`, `editorDistributeHorizontal`, `editorDistributeVertical`, `editorPositionTopLeft`, `editorPositionTopRight`, `editorPositionBottomRight`, and `editorPositionBottomLeft` glyphs to `EuiIcon` ([2070](https://github.com/elastic/eui/pull/2070))
**Bug fixes**
diff --git a/src-docs/src/views/icon/editor.js b/src-docs/src/views/icon/editor.js
new file mode 100644
index 00000000000..7ff493f6b8a
--- /dev/null
+++ b/src-docs/src/views/icon/editor.js
@@ -0,0 +1,74 @@
+// DON'T USE THIS
+// DON'T USE THIS
+// DON'T USE THIS
+// DON'T USE THIS
+// DON'T USE THIS
+
+// This example JS is overly complex for simple icon usage
+// and is set up this way for ease of use in our docs.
+//
+// Check the snippet tab for a more common usage.
+
+import React from 'react';
+
+import {
+ EuiFlexGrid,
+ EuiFlexItem,
+ EuiIcon,
+ EuiPanel,
+ EuiText,
+ EuiCopy,
+} from '../../../../src/components';
+
+const iconTypes = [
+ 'editorAlignCenter',
+ 'editorAlignLeft',
+ 'editorAlignRight',
+ 'editorBold',
+ 'editorCodeBlock',
+ 'editorComment',
+ 'editorDistributeHorizontal',
+ 'editorDistributeVertical',
+ 'editorHeading',
+ 'editorItalic',
+ 'editorItemAlignBottom',
+ 'editorItemAlignCenter',
+ 'editorItemAlignLeft',
+ 'editorItemAlignMiddle',
+ 'editorItemAlignRight',
+ 'editorItemAlignTop',
+ 'editorLink',
+ 'editorOrderedList',
+ 'editorPositionBottomLeft',
+ 'editorPositionBottomRight',
+ 'editorPositionTopLeft',
+ 'editorPositionTopRight',
+ 'editorRedo',
+ 'editorStrike',
+ 'editorTable',
+ 'editorUnderline',
+ 'editorUndo',
+ 'editorUnorderedList',
+];
+
+export default () => (
+
+ {iconTypes.map(iconType => (
+
+
+ {copy => (
+
+
+
+ {iconType}
+
+
+ )}
+
+
+ ))}
+
+);
diff --git a/src-docs/src/views/icon/icon_example.js b/src-docs/src/views/icon/icon_example.js
index dc02d35db1f..05d98d9c59f 100644
--- a/src-docs/src/views/icon/icon_example.js
+++ b/src-docs/src/views/icon/icon_example.js
@@ -52,6 +52,10 @@ import Apps from './apps';
const appsSource = require('!!raw-loader!./apps');
const appsSnippet = '';
+import Editor from './editor';
+const editorSource = require('!!raw-loader!./editor');
+const editorSnippet = '';
+
import Ml from './ml';
const mlSource = require('!!raw-loader!./ml');
const mlSnippet = '';
@@ -134,6 +138,27 @@ export const IconExample = {
snippet: iconsSnippet,
demo: ,
},
+ {
+ title: 'Editor controls',
+ source: [
+ {
+ type: GuideSectionTypes.JS,
+ code: editorSource,
+ },
+ {
+ type: GuideSectionTypes.HTML,
+ code: iconsHtml,
+ },
+ ],
+ text: (
+
+ Editor icons relate to the visual styling of elements and are
+ commonly used within EuiButtonGroup components.
+
+ ),
+ snippet: editorSnippet,
+ demo: ,
+ },
{
title: 'Apps',
source: [
diff --git a/src-docs/src/views/icon/icons.js b/src-docs/src/views/icon/icons.js
index 960b1eac6eb..73db7f649a2 100644
--- a/src-docs/src/views/icon/icons.js
+++ b/src-docs/src/views/icon/icons.js
@@ -56,22 +56,6 @@ const iconTypes = [
'database',
'document',
'dot',
- 'editorAlignCenter',
- 'editorAlignLeft',
- 'editorAlignRight',
- 'editorBold',
- 'editorCodeBlock',
- 'editorComment',
- 'editorHeading',
- 'editorItalic',
- 'editorLink',
- 'editorOrderedList',
- 'editorRedo',
- 'editorStrike',
- 'editorTable',
- 'editorUnderline',
- 'editorUndo',
- 'editorUnorderedList',
'email',
'empty',
'exit',
diff --git a/src/components/icon/__snapshots__/icon.test.tsx.snap b/src/components/icon/__snapshots__/icon.test.tsx.snap
index e579d6d46a3..b7cd6a06bc1 100644
--- a/src/components/icon/__snapshots__/icon.test.tsx.snap
+++ b/src/components/icon/__snapshots__/icon.test.tsx.snap
@@ -1620,6 +1620,36 @@ exports[`EuiIcon props type editorComment is rendered 1`] = `
`;
+exports[`EuiIcon props type editorDistributeHorizontal is rendered 1`] = `
+
+`;
+
+exports[`EuiIcon props type editorDistributeVertical is rendered 1`] = `
+
+`;
+
exports[`EuiIcon props type editorHeading is rendered 1`] = `