From 8ed34016cb5cebbca7e97d7e51d379f6e30a1f45 Mon Sep 17 00:00:00 2001
From: Jorge <jorge.costa@developer.pt>
Date: Wed, 7 Nov 2018 18:28:56 +0000
Subject: [PATCH] Always show block icon on the block switcher when a single
 block is selected

---
 .../src/components/block-switcher/index.js    | 15 +++++++++++++-
 .../src/components/block-switcher/style.scss  | 20 +++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/editor/src/components/block-switcher/index.js b/packages/editor/src/components/block-switcher/index.js
index d298834293471..292dacf98567e 100644
--- a/packages/editor/src/components/block-switcher/index.js
+++ b/packages/editor/src/components/block-switcher/index.js
@@ -58,7 +58,20 @@ export class BlockSwitcher extends Component {
 		const hasStyles = blocks.length === 1 && get( blockType, [ 'styles' ], [] ).length !== 0;
 
 		if ( ! hasStyles && ! possibleBlockTransformations.length ) {
-			return null;
+			if ( blocks.length > 1 ) {
+				return null;
+			}
+			return (
+				<Toolbar>
+					<IconButton
+						disabled
+						className="editor-block-switcher__no-switcher-icon"
+						label={ __( 'Block icon' ) }
+					>
+						<BlockIcon icon={ blockType.icon } showColors />
+					</IconButton>
+				</Toolbar>
+			);
 		}
 
 		return (
diff --git a/packages/editor/src/components/block-switcher/style.scss b/packages/editor/src/components/block-switcher/style.scss
index 503b312d3b647..daebe5a47ea72 100644
--- a/packages/editor/src/components/block-switcher/style.scss
+++ b/packages/editor/src/components/block-switcher/style.scss
@@ -3,15 +3,27 @@
 	height: $icon-button-size;
 }
 
-// Style this the same as the block buttons in the library.
-// Needs specificiity to override the icon button.
-.components-icon-button.editor-block-switcher__toggle {
-	width: auto;
+.components-icon-button.editor-block-switcher__toggle,
+.components-icon-button.editor-block-switcher__no-switcher-icon {
 	margin: 0;
 	display: block;
 	height: $icon-button-size;
 	padding: 3px;
+}
+
 
+.components-icon-button.editor-block-switcher__no-switcher-icon {
+	width: $icon-button-size + 6px + 6px;
+	.editor-block-icon {
+		margin-right: auto;
+		margin-left: auto;
+	}
+}
+
+// Style this the same as the block buttons in the library.
+// Needs specificiity to override the icon button.
+.components-icon-button.editor-block-switcher__toggle {
+	width: auto;
 	// Unset icon button styles.
 	&:active,
 	&:not(:disabled):not([aria-disabled="true"]):hover,