diff --git a/wp-admin/css/wp-admin-rtl.css b/wp-admin/css/wp-admin-rtl.css
index a4b40500c1..56f48057e8 100644
--- a/wp-admin/css/wp-admin-rtl.css
+++ b/wp-admin/css/wp-admin-rtl.css
@@ -23,7 +23,7 @@ TABLE OF CONTENTS:
 	11.1 - Custom Fields
 	11.2 - Post Revisions
 	11.3 - Featured Images
-	11.4 - Post Format Selection
+	11.4 - Post formats
 12.0 - Categories
 13.0 - Tags
 14.0 - Media Screen
@@ -1045,10 +1045,49 @@ th.sorted a span {
 }
 
 /*------------------------------------------------------------------------------
-  11.4 - Post format selection
+  11.4 - Post formats
 ------------------------------------------------------------------------------*/
 
+#post-body-content.wp-format-image label,
+#post-body-content.wp-format-video label,
+#post-body-content.wp-format-audio label {
+	float: right;
+}
 
+.wp-format-media-holder {
+	float: right;
+}
+
+#wp_format_image,
+#wp_format_audio,
+#wp_format_video {
+	float: right;
+	margin-right: 0;
+	margin-left: 23px;
+}
+
+.post-format-options a {
+	float: right;
+	margin-right: 0;
+	margin-left: 10px;
+}
+
+#poststuff .post-format-change {
+	margin: -7px 2px 13px 0;
+	clear: right;
+}
+
+.post-format-change span.icon {
+	float: right;
+	margin: 2px 0 0 5px;
+}
+
+@media only screen and (max-width: 782px) {
+	.post-format-options a {
+		margin-left: 0;
+		margin-right: 19px;
+	}
+}
 
 /*------------------------------------------------------------------------------
   12.0 - Categories
diff --git a/wp-admin/css/wp-admin.css b/wp-admin/css/wp-admin.css
index 57180fc3a2..35154a1089 100644
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
@@ -4046,7 +4046,7 @@ body .ui-slider-tooltip {
 	border: 1px dashed #dfdfdf;
 	background: #f5f5f5 url(../images/media-button-2x.png) no-repeat 50% 25%;
 	box-sizing: border-box;
-	position:relative;
+	position: relative;
 }
 
 .wp-format-media-holder:hover {
@@ -4055,7 +4055,7 @@ body .ui-slider-tooltip {
 
 .wp-format-media-holder.drag-over {
 	background: rgba( 0, 86, 132, 0.9 );
-	border-color:transparent;
+	border-color: transparent;
 }
 
 .wp-format-media-holder div {
@@ -4069,7 +4069,7 @@ body .ui-slider-tooltip {
 	right: 10px;
 	bottom: 10px;
 	border: 1px dashed #fff;
-	display:block;
+	display: block;
 }
 
 #poststuff .wp-format-media-holder.drag-over div h3 {
@@ -4087,7 +4087,7 @@ body .ui-slider-tooltip {
 	font-weight: 200;
 	color: #fff;
 	padding: 0;
-	text-align:center;
+	text-align: center;
 	font-family: sans-serif;
 }
 
@@ -4220,7 +4220,7 @@ body.wp-format-link #icon-edit,
 	border-style: solid;
 	-webkit-border-radius: 3px;
 	border-radius: 3px;
-	border-color: #CCC;
+	border-color: #ccc;
 	margin: 13px 0 10px;
 	padding: 5px;
 	overflow: hidden;
diff --git a/wp-admin/includes/post-formats.php b/wp-admin/includes/post-formats.php
index 557880da6c..7f05ca3217 100644
--- a/wp-admin/includes/post-formats.php
+++ b/wp-admin/includes/post-formats.php
@@ -67,17 +67,17 @@ wp_nonce_field( 'show-post-format-ui_' . $post_type, 'show_post_format_ui_nonce'
 
 		<div class="field wp-format-link">
 			<label for="wp_format_link_url"><?php _e( 'Link URL' ); ?></label>
-			<input type="text" id="wp_format_link_url" name="_format_link_url" value="<?php echo esc_url( $format_meta['link_url'] ); ?>" class="widefat" />
+			<input type="text" id="wp_format_link_url" name="_format_link_url" value="<?php echo esc_url( $format_meta['link_url'] ); ?>" class="widefat code" />
 		</div>
 
 		<div class="field wp-format-quote">
 			<label for="wp_format_quote_source_url"><?php _e( 'Quote source link' ); ?></label>
-			<input type="text" id="wp_format_quote_source_url" name="_format_quote_source_url" value="<?php echo esc_url( $format_meta['quote_source_url'] ); ?>" class="widefat" />
+			<input type="text" id="wp_format_quote_source_url" name="_format_quote_source_url" value="<?php echo esc_url( $format_meta['quote_source_url'] ); ?>" class="widefat code" />
 		</div>
 
 		<div class="field wp-format-image">
 			<label for="wp_format_image_url"><?php _e( 'Image click-through link' ); ?></label>
-			<input type="text" id="wp_format_image_url" name="_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" class="widefat" />
+			<input type="text" id="wp_format_image_url" name="_format_url" value="<?php echo esc_url( $format_meta['url'] ); ?>" class="widefat code" />
 		</div>
 
 		<div class="field wp-format-video">