diff --git a/wp-admin/upload.php b/wp-admin/upload.php
index dde7b71ef0..a4c87b6a45 100644
--- a/wp-admin/upload.php
+++ b/wp-admin/upload.php
@@ -168,7 +168,7 @@ foreach ($arc_result as $arc_row) {
 </select>
 <?php } ?>
 
-<input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button-secondary" />
+<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
 
 </div>
 
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index 37ffd6a402..4231991f95 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -26,7 +26,11 @@
 }
 
 .form-invalid {
-	background-color: #FF9999 !important;
+	background-color: #ffebe8 !important;
+}
+
+.form-invalid input {
+	border: 1px solid #c00 !important;
 }
 
 #uploading {
@@ -234,13 +238,12 @@ select {
 }
 
 .error {
-	background: #f00;
-	border: 1px solid #800;
- 	color: #fff;
+	background: #ffebe8;
+	border: 1px solid #c00;
 }
 
 .error a {
-	color: #fff;
+	color: #c00;
 }
 
 .narrow {
@@ -945,6 +948,14 @@ html, body {
 	background: #eaf3fa;
 }
 
+.form-table input {
+	border: 1px solid #c6d9e9;
+}
+
+.form-table textarea {
+	border: 1px solid #c6d9e9;
+}
+
 /* Post Screen */
 
 #tagchecklist {