Index: src/wp-admin/css/forms.css
===================================================================
--- src/wp-admin/css/forms.css	(revision 40130)
+++ src/wp-admin/css/forms.css	(working copy)
@@ -159,7 +159,8 @@
 @-moz-document url-prefix() {
 	input[type="checkbox"],
 	input[type="radio"],
-	.form-table input.tog {
+	.form-table input.tog,
+	.settings-fields input.tog {
 		margin-bottom: -1px;
 	}
 }
@@ -253,7 +254,8 @@
  	box-shadow: 0 0 2px rgba( 204, 0, 0, 0.8 );
 }
 
-.form-table .form-required.form-invalid td:after {
+.form-table .form-required.form-invalid td:after,
+.settings-fields .form-required.form-invalid .settings-field-control:after {
 	content: "\f534";
 	font: normal 20px/1 dashicons;
 	color: #dc3232;
@@ -262,11 +264,13 @@
 }
 
 /* Adjust error indicator for password layout */
-.form-table .form-required.user-pass1-wrap.form-invalid td:after {
+.form-table .form-required.user-pass1-wrap.form-invalid td:after,
+.settings-fields .form-required.user-pass1-wrap.form-invalid .settings-field-control:after {
 	content: '';
 }
 
-.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after {
+.form-table .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after,
+.settings-fields .form-required.user-pass1-wrap.form-invalid .password-input-wrapper:after {
 	content: '\f534';
 	font: normal 20px/1 dashicons;
 	color: #dc3232;
@@ -365,7 +369,10 @@
 
 table.form-table + p.submit,
 table.form-table + input + p.submit,
-table.form-table + input + input + p.submit {
+table.form-table + input + input + p.submit,
+.settings-fields + p.submit,
+.settings-fields + input + p.submit,
+.settings-fields + input + input + p.submit {
 	border-top: none;
 	padding-top: 0;
 }
@@ -530,7 +537,8 @@
 	display: inline-block;
 }
 
-.form-table span.description.important {
+.form-table span.description.important,
+.settings-fields span.description.important {
 	font-size: 12px;
 }
 
@@ -612,21 +620,33 @@
   15.0 - Comments Screen
 ------------------------------------------------------------------------------*/
 
-.form-table {
+.form-table,
+.settings-fields {
+	display: table;
 	border-collapse: collapse;
 	margin-top: 0.5em;
 	width: 100%;
 	clear: both;
 }
 
+.settings-fields .settings-field {
+	display: table-row;
+}
+
 .form-table,
 .form-table td,
 .form-table th,
-.form-table td p {
+.form-table td p,
+.settings-fields,
+.settings-fields .settings-field-control,
+.settings-fields .settings-field-title,
+.settings-fields .settings-field-control p {
 	font-size: 14px;
 }
 
-.form-table td {
+.form-table td,
+.settings-fields .settings-field-control {
+	display: table-cell;
 	margin-bottom: 9px;
 	padding: 15px 10px;
 	line-height: 1.3;
@@ -634,6 +654,7 @@
 }
 
 .form-table th,
+.settings-fields .settings-field-title,
 .form-wrap label {
 	color: #23282d;
 	font-weight: 400;
@@ -641,7 +662,9 @@
 	vertical-align: baseline;
 }
 
-.form-table th {
+.form-table th,
+.settings-fields .settings-field-title {
+	display: table-cell;
 	vertical-align: top;
 	text-align: left;
 	padding: 20px 10px 20px 0;
@@ -650,52 +673,69 @@
 	font-weight: 600;
 }
 
-.form-table th.th-full {
+.form-table th.th-full,
+.settings-fields .settings-field-title.th-full {
 	width: auto;
 	font-weight: 400;
 }
 
-.form-table td p {
+.form-table td p,
+.settings-fields .settings-field-control p {
 	margin-top: 4px;
 	margin-bottom: 0;
 }
 
-.form-table .date-time-doc {
+.settings-fields .settings-field-control .title-label {
+	font-weight: 600;
+}
+
+.form-table .date-time-doc,
+.settings-fields .date-time-doc {
 	margin-top: 1em;
 }
 
-.form-table p.timezone-info {
+.form-table p.timezone-info,
+.settings-fields p.timezone-info {
 	margin: 1em 0;
 }
 
-.form-table td fieldset label {
+.form-table td fieldset label,
+.settings-fields .settings-field-control .radio-item,
+.settings-fields .settings-field-control .multibox-item {
 	margin: 0.25em 0 0.5em !important;
 	display: inline-block;
 }
 
 .form-table td fieldset label,
 .form-table td fieldset p,
-.form-table td fieldset li {
+.form-table td fieldset li,
+.settings-fields .settings-field-control .radio-item,
+.settings-fields .settings-field-control .multibox-item {
 	line-height: 1.4em;
 }
 
 .form-table input.tog,
-.form-table input[type="radio"] {
+.form-table input[type="radio"],
+.settings-fields input.tog,
+.settings-fields input[type="radio"] {
 	margin-top: -4px;
 	margin-right: 4px;
 	float: none;
 }
 
-.form-table .pre {
+.form-table .pre,
+.settings-fields .pre {
 	padding: 8px;
 	margin: 0;
 }
 
-table.form-table td .updated {
+table.form-table td .updated,
+.settings-fields .settings-field-control .updated {
 	font-size: 13px;
 }
 
-table.form-table td .updated p {
+table.form-table td .updated p,
+.settings-fields .settings-field-control .updated p {
 	font-size: 13px;
 	margin: 0.3em 0;
 }
@@ -704,12 +744,14 @@
   18.0 - Users
 ------------------------------------------------------------------------------*/
 
-#profile-page .form-table textarea {
+#profile-page .form-table textarea,
+#profile-page .settings-fields textarea {
 	width: 500px;
 	margin-bottom: 6px;
 }
 
-#profile-page .form-table #rich_editing {
+#profile-page .form-table #rich_editing,
+#profile-page .settings-fields #rich_editing {
 	margin-right: 5px
 }
 
@@ -1173,14 +1215,21 @@
 		width: 100%;
 	}
 
-	.form-table {
+	.form-table,
+	.settings-fields {
 		-webkit-box-sizing: border-box;
 		-moz-box-sizing: border-box;
 		box-sizing: border-box;
 	}
 
+	.settings-field {
+		display: block;
+	}
+
 	.form-table th,
 	.form-table td,
+	.settings-fields .settings-field-title,
+	.settings-fields .settings-field-control,
 	.label-responsive {
 		display: block;
 		width: auto;
@@ -1195,12 +1244,14 @@
 		margin-bottom: 0;
 	}
 
-	.form-table .color-palette td {
+	.form-table .color-palette td,
+	.settings-fields .color-palette td {
 		display: table-cell;
 		width: 15px;
 	}
 
-	.form-table table.color-palette {
+	.form-table table.color-palette,
+	.settings-fields table.color-palette {
 		margin-right: 10px;
 	}
 
@@ -1215,7 +1266,14 @@
 	.form-table td select,
 	.form-table td textarea,
 	.form-table span.description,
-	#profile-page .form-table textarea {
+	#profile-page .form-table textarea,
+	.settings-fields .settings-field-control input[type="text"],
+	.settings-fields .settings-field-control input[type="email"],
+	.settings-fields .settings-field-control input[type="password"],
+	.settings-fields .settings-field-control select,
+	.settings-fields .settings-field-control textarea,
+	.settings-fields span.description,
+	#profile-page .settings-fields textarea {
 		width: 100%;
 		font-size: 16px;
 		line-height: 1.5;
@@ -1227,12 +1285,14 @@
 		box-sizing: border-box;
 	}
 
-	.form-table .form-required.form-invalid td:after {
+	.form-table .form-required.form-invalid td:after,
+	.settings-fields .form-required.form-invalid .settings-field-control:after {
 		float: right;
 		margin: -30px 3px 0 0;
 	}
 
-	#wpbody .form-table td select {
+	#wpbody .form-table td select,
+	#wpbody .settings-fields .settings-field-control select {
 		height: 40px;
 	}
 
@@ -1241,7 +1301,8 @@
 	input[type="password"].small-text,
 	input[type="number"].small-text,
 	input[type="number"].small-text,
-	.form-table input[type="text"].small-text {
+	.form-table input[type="text"].small-text,
+	.settings-fields input[type="text"].small-text {
 		width: auto;
 		max-width: 55px;
 		display: inline;
@@ -1279,45 +1340,53 @@
 		margin-bottom: 10px;
 	}
 
-	.form-table span.description {
+	.form-table span.description,
+	.settings-fields span.description {
 		display: inline;
 		padding: 4px 0 0;
 		line-height: 1.4em;
 		font-size: 14px;
 	}
 
-	.form-table th {
+	.form-table th,
+	.settings-fields .settings-field-title {
 		padding-top: 10px;
 		padding-bottom: 0;
 		border-bottom: 0;
 	}
 
-	.form-table td {
+	.form-table td,
+	.settings-fields .settings-field-control {
 		margin-bottom: 0;
 		padding-bottom: 6px;
 		padding-top: 4px;
 		padding-left: 0;
 	}
 
-	.form-table.permalink-structure td code {
+	.form-table.permalink-structure td code,
+	.settings-fields.permalink-structure .settings-field-control code {
 		margin-left: 32px;
 	}
 
-	.form-table.permalink-structure td input[type="text"] {
+	.form-table.permalink-structure td input[type="text"],
+	.settings-fields.permalink-structure .settings-field-control input[type="text"] {
 		margin-left: 32px;
 		margin-top: 4px;
 		width: 96%;
 	}
 
-	.form-table input.regular-text {
+	.form-table input.regular-text,
+	.settings-fields input.regular-text {
 		width: 100%;
 	}
 
-	.form-table label {
+	.form-table label,
+	.settings-fields label {
 		font-size: 14px;
 	}
 
-	.form-table fieldset label {
+	.form-table fieldset label,
+	.settings-fields fieldset label {
 		display: block;
 	}
 
@@ -1328,7 +1397,7 @@
 		margin-top: 0.5em;
 	}
 
-	.form-field #domain {
+	.form-field #domain, {
 		max-width: none;
 	}
 
@@ -1385,7 +1454,8 @@
 	}
 
 	/* users */
-	#profile-page .form-table textarea {
+	#profile-page .form-table textarea,
+	#profile-page .settings-fields textarea {
 		max-width: 400px;
 		width: auto;
 	}