diff --git a/tinymce-single/blocks/elements/lists/register.js b/tinymce-single/blocks/elements/lists/register.js
index c198961fbce1de..83747d8fcd1b29 100644
--- a/tinymce-single/blocks/elements/lists/register.js
+++ b/tinymce-single/blocks/elements/lists/register.js
@@ -18,7 +18,8 @@ window.wp.blocks.register( {
 			}
 		},
 		{
-			icon: 'gridicons-posts',
+			classes: 'remove-formatting',
+			icon: 'gridicons-list-unordered',
 			onClick: function( editor, element ) {
 				if ( element.nodeName === 'UL' ) {
 					editor.execCommand( 'InsertUnorderedList' );
diff --git a/tinymce-single/blocks/elements/preformatted/register.js b/tinymce-single/blocks/elements/preformatted/register.js
index 432f8e57cbb9e9..d6726e95b8523b 100644
--- a/tinymce-single/blocks/elements/preformatted/register.js
+++ b/tinymce-single/blocks/elements/preformatted/register.js
@@ -4,10 +4,11 @@ window.wp.blocks.register( {
 	icon: 'gridicons-code',
 	buttons: [
 		{
-			text: 'syntax'
+			icon: 'gridicons-cog'
 		},
 		{
-			icon: 'gridicons-posts',
+			classes: 'remove-formatting',
+			icon: 'gridicons-code',
 			onClick: function( editor ) {
 				editor.formatter.remove( 'pre' );
 			}
diff --git a/tinymce-single/tinymce/block.css b/tinymce-single/tinymce/block.css
index 35377e56d3af6d..df75c926929dd7 100644
--- a/tinymce-single/tinymce/block.css
+++ b/tinymce-single/tinymce/block.css
@@ -256,16 +256,17 @@ div.mce-inline-toolbar-grp.block-toolbar {
 	box-shadow: none;
 }
 
-.mce-btn.mce-move-up {
-	position: absolute;
-	top: -10px;
-	left: -30px;
+.mce-btn.mce-move-up,
+.mce-btn.mce-move-down {
+	display: block;
 }
 
-.mce-btn.mce-move-down {
-	position: absolute;
-	bottom: -10px;
-	left: -30px;
+.mce-btn.mce-move-up,
+.mce-btn.mce-move-up button,
+.mce-btn.mce-move-down,
+.mce-btn.mce-move-down button {
+	padding-top: 0;
+	padding-bottom: 0;
 }
 
 .block-toolbar {
diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
index 55118897270d03..477c7c6fa916e6 100644
--- a/tinymce-single/tinymce/block.js
+++ b/tinymce-single/tinymce/block.js
@@ -223,7 +223,7 @@
 
 			var toolbarInline = editor.wp._createToolbar( [ 'bold', 'italic', 'strikethrough', 'link' ] );
 			var toolbarCaret = editor.wp._createToolbar( [ 'add' ] );
-			blockToolbar = editor.wp._createToolbar( [ 'up', 'block', 'down' ] );
+			blockToolbar = editor.wp._createToolbar( [ 'up', 'down' ] );
 
 			toolbarCaret.$el.addClass( 'block-toolbar' );
 			blockToolbar.$el.addClass( 'block-toolbar' );