diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index a8c8e612b6..63c3a027e1 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2061,13 +2061,19 @@ html.wp-toolbar {
 	user-select: none;
 }
 
-.postbox .inside,
-.stuffbox .inside {
+.postbox .inside {
 	padding: 0 12px 12px;
 	line-height: 1.4em;
 	font-size: 13px;
 }
 
+.stuffbox .inside {
+	padding: 0;
+	line-height: 1.4em;
+	font-size: 13px;
+	margin-top: 0;
+}
+
 .postbox .inside {
 	margin: 11px 0;
 	position: relative;
@@ -2363,11 +2369,8 @@ body.iframe {
 }
 
 .edit-comment-author {
-	font-size: 14px;
-	line-height: 1.4;
-	font-weight: 600;
 	color: #222;
-	margin: 2px 0 0 9px;
+	border-bottom: 1px solid #eee;
 }
 
 #namediv h3 label, /* Back-compat for pre-4.4 */
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 00c68e2bf6..f7850e5054 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -607,10 +607,18 @@ span.wp-media-buttons-icon:before {
 	line-height: 1.4;
 }
 
+#poststuff .stuffbox h2 {
+	padding: 8px 10px;
+}
+
 #poststuff .inside {
 	margin: 6px 0 0 0;
 }
 
+#poststuff .stuffbox .inside {
+  margin: 0;
+}
+
 #poststuff .inside #parent_id,
 #poststuff .inside #page_template {
 	max-width: 100%;
@@ -1246,6 +1254,15 @@ p.popular-tags a {
 
 .stuffbox .editcomment {
 	clear: none;
+	margin-top: 0;
+}
+
+#namediv.stuffbox .editcomment input {
+	width: 100%;
+}
+
+#namediv.stuffbox .editcomment.form-table td {
+	padding: 10px;
 }
 
 #comment-status-radio p {
@@ -1439,12 +1456,20 @@ table.links-table {
 		padding: 10px 10px;
 	}
 
+	#poststuff .stuffbox .inside {
+		padding: 0 2px 4px 0;
+	}
+
 	#poststuff h3.hndle, /* Back-compat for pre-4.4 */
 	#poststuff .stuffbox > h3, /* Back-compat for pre-4.4 */
 	#poststuff h2 {
 		padding: 12px;
 	}
 
+	#namediv.stuffbox .editcomment.form-table td {
+		padding: 5px 10px;
+	}
+
 	.post-format-options {
 		padding-right: 0;
 	}
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
index 12849edcf7..3e48f937e7 100644
--- a/src/wp-admin/edit-form-comment.php
+++ b/src/wp-admin/edit-form-comment.php
@@ -41,28 +41,29 @@ if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_
 <div id="namediv" class="stuffbox">
 <div class="inside">
 <fieldset>
-<legend class="edit-comment-author"><?php _e( 'Author' ); ?></legend>
+<h2 class="edit-comment-author">
+	<span><?php _e( 'Author' ); ?></span>
+</h2>
 <table class="form-table editcomment">
 <tbody>
 <tr>
-	<td class="first"><label for="name"><?php _e( 'Name:' ); ?></label></td>
+	<td class="first"><label for="name"><?php _e( 'Name' ); ?></label></td>
 	<td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
 </tr>
 <tr>
-	<td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
+	<td class="first"><label for="email"><?php _e( 'Email' ); ?></label></td>
 	<td>
 		<input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
 	</td>
 </tr>
 <tr>
-	<td class="first"><label for="newcomment_author_url"><?php _e( 'URL:' ); ?></label></td>
+	<td class="first"><label for="newcomment_author_url"><?php _e( 'URL' ); ?></label></td>
 	<td>
 		<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr( $comment->comment_author_url ); ?>" />
 	</td>
 </tr>
 </tbody>
 </table>
-<br />
 </fieldset>
 </div>
 </div>