diff --git a/tinymce-single/blocks/elements/headings/register.js b/tinymce-single/blocks/elements/headings/register.js
index 0b30920a4bc8b..3ff66208e2d9b 100644
--- a/tinymce-single/blocks/elements/headings/register.js
+++ b/tinymce-single/blocks/elements/headings/register.js
@@ -21,7 +21,7 @@
 			}
 		} );
 
-		controls.push( 'text-align-left', 'text-align-center', 'text-align-right' );
+		controls.push( '|', 'text-align-left', 'text-align-center', 'text-align-right' );
 
 		return controls;
 	}
diff --git a/tinymce-single/blocks/elements/paragraph/register.js b/tinymce-single/blocks/elements/paragraph/register.js
index 498cb04648fee..db94a74106b3c 100644
--- a/tinymce-single/blocks/elements/paragraph/register.js
+++ b/tinymce-single/blocks/elements/paragraph/register.js
@@ -7,6 +7,7 @@ window.wp.blocks.registerBlock( {
 	icon: 'gridicons-posts',
 	controls: [
 		'text-switcher',
+		'|',
 		'text-align-left',
 		'text-align-center',
 		'text-align-right'
diff --git a/tinymce-single/tinymce/block.css b/tinymce-single/tinymce/block.css
index cd741530d416c..0f591218373a0 100644
--- a/tinymce-single/tinymce/block.css
+++ b/tinymce-single/tinymce/block.css
@@ -150,18 +150,18 @@ svg.gridicon {
 	transform: rotate( 90deg );
 }
 
-div.mce-inline-toolbar-grp {
+div.mce-btn-group {
 	background-color: #fff;
 	border: 1px solid #e1e6ea;
 	box-shadow: 0px 3px 20px rgba( 18, 24, 30, .1 ), 0px 1px 3px rgba( 18, 24, 30, .1 );
 	box-sizing: border-box;
-	margin-bottom: 8px;
-	position: absolute;
+	margin-right: 8px;
 	-moz-user-select: none;
 	-webkit-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
-	max-width: 98%;
+	display: block;
+	float: left;
 }
 
 div.wp-link-preview {
@@ -201,7 +201,7 @@ div.wp-link-input input {
 	}
 }
 
-div.mce-inline-toolbar-grp.block-toolbar {
+div.block-toolbar .mce-btn-group {
 	border: none;
 	background: none;
 	box-shadow: none;
@@ -311,6 +311,10 @@ div.mce-inline-toolbar-grp.block-toolbar > div.mce-stack-layout {
 	width: 330px;
 }
 
+.insert-menu .mce-btn-group {
+	margin: 0;
+}
+
 .insert-menu .mce-btn {
 	float: left;
 }
@@ -367,4 +371,8 @@ div.mce-inline-toolbar-grp.block-toolbar > div.mce-stack-layout {
 	position: relative;
 	background: none;
 	color: #12181e;
+	-moz-user-select: none;
+	-webkit-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
 }
diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
index 04e0138bc01db..493fdd8717e26 100644
--- a/tinymce-single/tinymce/block.js
+++ b/tinymce-single/tinymce/block.js
@@ -530,7 +530,7 @@
 
 					DOM.setStyles( toolbar, {
 						position: 'absolute',
-						left: Math.max( contentRect.left + editorPadding, elementRect.left ) + 8 + blockToolbarWidth + 'px',
+						left: Math.max( contentRect.left + editorPadding, elementRect.left ) + blockToolbarWidth + 'px',
 						top: elementRect.top + window.pageYOffset - toolbarRect.height - 8 + 'px'
 					} );