Dock the keyboard hide button to the right side of the screen

src/block-management/block-toolbar.js

@@ -10,7 +10,6 @@ import { compose } from '@wordpress/compose';
 import { Toolbar, ToolbarButton } from '@wordpress/components';
 import { BlockFormatControls, BlockControls } from '@wordpress/editor';
 import { __ } from '@wordpress/i18n';
-import KeyboardHideButton from '../components/keyboard-hide-button';
 
 import styles from './block-toolbar.scss';
 
@@ -65,14 +64,16 @@ export class BlockToolbar extends Component<PropsType> {
 							onClick={ redo }
 						/>
 					</Toolbar>
-					{ showKeyboardHideButton && ( <Toolbar>
-						<KeyboardHideButton
-							onPress={ this.onKeyboardHide }
-						/>
-					</Toolbar> ) }
 					<BlockControls.Slot />
 					<BlockFormatControls.Slot />
 				</ScrollView>
+				{ showKeyboardHideButton &&
+				( <Toolbar passedStyle={ styles.keyboardHideContainer }>
+					<ToolbarButton
+						icon="keyboard-hide"
+						onClick={ this.onKeyboardHide }
+					/>
+				</Toolbar> ) }
 			</View>
 		);
 	}

src/block-management/block-toolbar.scss

@@ -5,3 +5,12 @@
     border-top-color: #e9eff3;
     border-top-width: 1;
 }
+
+.keyboardHideContainer {
+    padding-right: 0px;
+    padding-left: 0px;
+    padding-top: 4px;
+    width: 44;
+    justify-content: center;
+    align-items: center;
+}