Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 16885)
+++ wp-admin/plugins.php	(working copy)
@@ -360,7 +360,13 @@
 
 <div class="wrap">
 <?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); if ( current_user_can('install_plugins') ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2>
+<h2>
+<?php echo esc_html( $title );
+if ( current_user_can('install_plugins') ) { 
+$href = is_multisite() ? network_admin_url( 'plugin-install.php' ) : admin_url( 'plugin-install.php' ); ?>
+<a href="<?php echo $href; ?>" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
+<?php } ?>
+</h2>
 
 <?php do_action( 'pre_current_active_plugins', $plugins['all'] ) ?>
 
Index: wp-admin/themes.php
===================================================================
--- wp-admin/themes.php	(revision 16885)
+++ wp-admin/themes.php	(working copy)
@@ -83,7 +83,7 @@
 	<?php endif;
 else : ?>
 <h2>
-<?php esc_html_e( $title ); ?>
+<?php echo esc_html( $title ); ?>
 <?php endif; ?>
 </h2>