diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 5175972b5a..54aca70f2f 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -2453,7 +2453,7 @@ body.iframe {
 }
 
 #namediv input {
-	width: 98%;
+	width: 100%;
 }
 
 #namediv p {
diff --git a/src/wp-admin/css/edit.css b/src/wp-admin/css/edit.css
index 59929b5c6e..74274b4914 100644
--- a/src/wp-admin/css/edit.css
+++ b/src/wp-admin/css/edit.css
@@ -77,7 +77,7 @@
 
 input#link_description,
 input#link_url {
-	width: 98%;
+	width: 100%;
 }
 
 #pending {
@@ -654,6 +654,11 @@ form#tags-filter {
 	margin: 6px 0 0 0;
 }
 
+.link-php #poststuff .inside,
+.link-add-php #poststuff .inside {
+	margin-top: 12px;
+}
+
 #poststuff .stuffbox .inside {
 	margin: 0;
 }
diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php
index 261d891e9d..93a872aa61 100644
--- a/src/wp-admin/edit-link-form.php
+++ b/src/wp-admin/edit-link-form.php
@@ -110,24 +110,24 @@ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
 
 <div id="post-body" class="metabox-holder columns-<?php echo ( 1 === get_current_screen()->get_columns() ) ? '1' : '2'; ?>">
 <div id="post-body-content">
-<div id="namediv" class="stuffbox">
-<h2><label for="link_name"><?php _ex( 'Name', 'link name' ); ?></label></h2>
+<div id="namediv" class="postbox">
+<h2 class="postbox-header"><label for="link_name"><?php _ex( 'Name', 'link name' ); ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_name" size="30" maxlength="255" value="<?php echo esc_attr( $link->link_name ); ?>" id="link_name" />
 	<p><?php _e( 'Example: Nifty blogging software' ); ?></p>
 </div>
 </div>
 
-<div id="addressdiv" class="stuffbox">
-<h2><label for="link_url"><?php _e( 'Web Address' ); ?></label></h2>
+<div id="addressdiv" class="postbox">
+<h2 class="postbox-header"><label for="link_url"><?php _e( 'Web Address' ); ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_url" size="30" maxlength="255" class="code" value="<?php echo esc_attr( $link->link_url ); ?>" id="link_url" />
 	<p><?php _e( 'Example: <code>https://wordpress.org/</code> &#8212; don&#8217;t forget the <code>https://</code>' ); ?></p>
 </div>
 </div>
 
-<div id="descriptiondiv" class="stuffbox">
-<h2><label for="link_description"><?php _e( 'Description' ); ?></label></h2>
+<div id="descriptiondiv" class="postbox">
+<h2 class="postbox-header"><label for="link_description"><?php _e( 'Description' ); ?></label></h2>
 <div class="inside">
 	<input type="text" name="link_description" size="30" maxlength="255" value="<?php echo isset( $link->link_description ) ? esc_attr( $link->link_description ) : ''; ?>" id="link_description" />
 	<p><?php _e( 'This will be shown when someone hovers over the link in the blogroll, or optionally below the link.' ); ?></p>