diff --git a/src/wp-admin/css/common.css b/src/wp-admin/css/common.css
index 2d67f34f9b..564e6b42c9 100644
--- a/src/wp-admin/css/common.css
+++ b/src/wp-admin/css/common.css
@@ -1461,6 +1461,22 @@ div.error {
 	margin: 5px 0 15px;
 }
 
+.wrap #templateside .notice {
+	display: block;
+	margin: 0;
+	padding: 5px 12px;
+	font-weight: 600;
+	text-decoration: none;
+}
+
+.wrap #templateside span.notice {
+  margin-left: -12px;
+}
+
+#templateside li.notice a {
+  padding: 0;
+}
+
 /* Update icon. */
 .update-message p:before,
 .updating-message p:before,
diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php
index 8925a5b8dd..bc21642153 100644
--- a/src/wp-admin/plugin-editor.php
+++ b/src/wp-admin/plugin-editor.php
@@ -321,8 +321,8 @@ foreach ( $plugin_files as $plugin_file ) :
 		// No extension found
 		continue;
 	}
-?>
-		<li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&amp;plugin=<?php echo urlencode( $plugin ) ?>"><?php echo esc_html( $plugin_file ); ?></a></li>
+	?>
+	<li class="<?php echo esc_attr( $file === $plugin_file ? 'notice notice-info' : '' ); ?>"><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ); ?>&amp;plugin=<?php echo urlencode( $plugin ); ?>"><?php echo esc_html( $plugin_file ); ?></a></li>
 <?php endforeach; ?>
 	</ul>
 </div>
diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php
index 64290c4027..35ec0402bc 100644
--- a/src/wp-admin/theme-editor.php
+++ b/src/wp-admin/theme-editor.php
@@ -283,7 +283,7 @@ if ( $allowed_files ) :
 		}
 
 		if ( $absolute_filename === $file ) {
-			$file_description = '<span class="highlight">' . $file_description . '</span>';
+			$file_description = '<span class="notice notice-info">' . $file_description . '</span>';
 		}
 
 		$previous_file_type = $file_type;