diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index dc3cb88a5d..a9eedcb879 100644
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -25,11 +25,12 @@ echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="ht
 <?php
 do_action('admin_footer', '');
 do_action('admin_print_footer_scripts');
+do_action("admin_footer-$hook_suffix");
 
 if ( false === get_option('can_compress_scripts') )
 	compression_test();
 ?>
+
 <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
 </body>
 </html>
-
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 0319a947df..9c553a8ceb 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -3381,7 +3381,6 @@ function screen_icon($name = '') {
 		else
 			$name = str_replace(array('.php', '-new', '-add'), '', $hook_suffix);
 	}
-	unset($hook_suffix);
 ?>
 	<div id="icon-<?php echo $name; ?>" class="icon32"><br /></div>
 <?php
diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index dbed7c4546..33cb169b62 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -160,7 +160,7 @@ class WP_Scripts extends WP_Dependencies {
 		if ( !empty($this->in_footer) ) {
 			foreach( $this->in_footer as $key => $handle ) {
 				if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
-					$this->do_item($handle, false, $this->doecho);
+					$this->do_item($handle);
 					$this->done[] = $handle;
 					unset( $this->in_footer[$key] );
 				}