diff --git a/tinymce-single/blocks/core/gallery/register.js b/tinymce-single/blocks/core/gallery/register.js
index dd993aff73778a..b71dcd3296ec31 100644
--- a/tinymce-single/blocks/core/gallery/register.js
+++ b/tinymce-single/blocks/core/gallery/register.js
@@ -3,7 +3,7 @@ window.wp.blocks.register( {
 	namespace: 'core',
 	type: 'image',
 	keywords: [],
-	icon: 'gridicons-image',
+	icon: 'gridicons-image-multiple',
 	buttons: [
 		'block-align-left',
 		'block-align-center',
diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
index 285b84e84f3dfc..08b22eada18e73 100644
--- a/tinymce-single/tinymce/block.js
+++ b/tinymce-single/tinymce/block.js
@@ -9,13 +9,21 @@
 			if ( settings.elements ) {
 				settings.elements.forEach( function( element ) {
 					_settings[ 'element:' + element ] = settings;
+					_settings[ 'element:' + element ]._id = 'element:' + element;
 				} );
 			} else if ( settings.namespace && settings.name ) {
 				_settings[ settings.namespace + ':' + settings.name ] = settings;
+				_settings[ settings.namespace + ':' + settings.name ]._id = settings.namespace + ':' + settings.name;
 			}
 		},
 		getSettings: function( id ) {
 			return _settings[ id ];
+		},
+		getSettingsByElement( element ) {
+			var blockType = element.getAttribute( 'data-wp-block-type' );
+			var nodeName = element.nodeName.toLowerCase();
+
+			return this.getSettings( blockType || 'element:' + nodeName );
 		}
 	};
 } )( window.wp = window.wp || {} );
@@ -98,7 +106,7 @@
 	} );
 } )( window.wp.blocks.register );
 
-( function( tinymce ) {
+( function( tinymce, wp ) {
 	tinymce.PluginManager.add( 'block', function( editor ) {
 		function focusToolbar( toolbar ) {
 			var node = toolbar.find( 'toolbar' )[0];
@@ -325,13 +333,7 @@
 
 					editor.on( 'nodechange', function( event ) {
 						element = event.parents[ event.parents.length - 1 ];
-
-						tinymce.each( editor.settings.blocks, function( block, key ) {
-							if ( block.match( element ) ) {
-								button.icon( block.icon || '' );
-								button.text( block.text || '' );
-							}
-						} );
+						button.icon( wp.blocks.getSettingsByElement( element ).icon );
 					} );
 				}
 			});
@@ -504,23 +506,20 @@
 			}
 
 			function showBlockUI( focus ) {
-				blockToolbar.reposition();
+				var settings = wp.blocks.getSettingsByElement( element );
 
-				var name = element.getAttribute( 'data-wp-block-type' ) || 'element:' + element.nodeName.toLowerCase();
-				var settings = wp.blocks.getSettings( name );
-
-				console.log(name, settings);
+				blockToolbar.reposition();
 
 				tinymce.each( blockToolbars, function( toolbar, key ) {
-					if ( key !== name ) {
+					if ( key !== settings._id ) {
 						toolbar.hide();
 					}
 				} );
 
 				if ( settings ) {
-					if ( ! blockToolbars[ name ] ) {
-						blockToolbars[ name ] = editor.wp._createToolbar( settings.buttons.concat( [ 'block-remove' ] ) );
-						blockToolbars[ name ].reposition = function () {
+					if ( ! blockToolbars[ settings._id ] ) {
+						blockToolbars[ settings._id ] = editor.wp._createToolbar( settings.buttons.concat( [ 'block-remove' ] ) );
+						blockToolbars[ settings._id ].reposition = function () {
 							if (!element) return
 
 							var toolbar = this.getEl();
@@ -540,8 +539,8 @@
 						editor.nodeChanged(); // Update UI.
 					}
 
-					blockToolbars[ name ].reposition();
-					focus && focusToolbar( blockToolbars[ name ] );
+					blockToolbars[ settings._id ].reposition();
+					focus && focusToolbar( blockToolbars[ settings._id ] );
 				}
 			}
 
@@ -559,6 +558,11 @@
 				var selection = window.getSelection();
 				var isCollapsed = selection.isCollapsed;
 				var anchorNode = selection.anchorNode;
+
+				if ( ! anchorNode ) {
+					return;
+				}
+
 				var isEmpty = isCollapsed && isEmptySlot( anchorNode );
 				var isBlockUIVisible = ! hidden;
 
@@ -675,4 +679,4 @@
 			} );
 		} );
 	} );
-} )( window.tinymce );
+} )( window.tinymce, window.wp );