diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 61fe2f4a02..7d531fa67d 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -1432,11 +1432,11 @@ table.links-table {
 		padding: 10px 20px;
 	}
 
-	a.wp-switch-editor {
+	button.wp-switch-editor {
 		font-size: 16px;
 		line-height: 1em;
-		margin: 3px 0 0 7px;
-		padding: 12px 15px;
+		margin: 7px 0 0 7px;
+		padding: 8px 12px;
 	}
 
 	#wp-content-media-buttons a {
diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php
index ebda7a3f69..a0dada7341 100644
--- a/src/wp-admin/edit-form-advanced.php
+++ b/src/wp-admin/edit-form-advanced.php
@@ -504,7 +504,7 @@ if ( post_type_supports($post_type, 'editor') ) {
 <?php wp_editor( $post->post_content, 'content', array(
 	'dfw' => true,
 	'drag_drop_upload' => true,
-	'tabfocus_elements' => 'insert-media-button,save-post',
+	'tabfocus_elements' => 'content-html,save-post',
 	'editor_height' => 300,
 	'tinymce' => array(
 		'resize' => false,
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index e86a85a340..e034bea20b 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -177,8 +177,8 @@ final class _WP_Editors {
 				$switch_class = 'tmce-active';
 			}
 
-			$buttons .= '<a id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</a>\n";
-			$buttons .= '<a id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</a>\n";
+			$buttons .= '<button type="button" id="' . $editor_id . '-tmce" class="wp-switch-editor switch-tmce" onclick="switchEditors.switchto(this);">' . __('Visual') . "</button>\n";
+			$buttons .= '<button type="button" id="' . $editor_id . '-html" class="wp-switch-editor switch-html" onclick="switchEditors.switchto(this);">' . _x( 'Text', 'Name for the Text editor tab (formerly HTML)' ) . "</button>\n";
 		}
 
 		$wrap_class = 'wp-core-ui wp-editor-wrap ' . $switch_class;
diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css
index e69869a403..8de8b04533 100644
--- a/src/wp-includes/css/editor.css
+++ b/src/wp-includes/css/editor.css
@@ -827,26 +827,42 @@ i.mce-i-hr:before {
 }
 
 .wp-switch-editor {
-	background: #ebebeb;
-	border: 1px solid #dedede;
-	color: #777;
-	cursor: pointer;
-	float: right;
-	font: 13px/19px "Open Sans", sans-serif;
-	height: 19px;
-	margin: 5px 0 0 5px;
-	padding: 3px 8px 4px;
+	float: left;
+	box-sizing: content-box;
 	position: relative;
 	top: 1px;
+	background: #ebebeb;
+	color: #777;
+	cursor: pointer;
+	font: 13px/19px "Open Sans", sans-serif;
+	height: 20px;
+	margin: 5px 0 0 5px;
+	padding: 3px 8px 4px;
+	border: 1px solid #e5e5e5;
+}
+
+.wp-switch-editor:focus {
+	-webkit-box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
+	box-shadow:
+		0 0 0 1px #5b9dd9,
+		0 0 2px 1px rgba(30, 140, 190, .8);
+	outline: none;
+	color: #222;
+}
+
+.wp-switch-editor:active,
+.html-active .switch-html:focus,
+.tmce-active .switch-tmce:focus {
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }
 
 .wp-switch-editor:active {
-	background-color: #f1f1f1;
-}
-
-.wp-switch-editor:hover {
-	text-decoration: none !important;
-	background: #fff;
+	background-color: #f5f5f5;
+	-webkit-box-shadow: none;
+	box-shadow: none;
 }
 
 .js .tmce-active .wp-editor-area {
@@ -861,8 +877,7 @@ i.mce-i-hr:before {
 .html-active .switch-html {
 	background: #f5f5f5;
 	color: #555;
-	height: 20px;
-	border-bottom: none;
+	border-bottom-color: #f5f5f5;
 }
 
 .wp-media-buttons {