Index: wp-admin/includes/template.php
===================================================================
--- wp-admin/includes/template.php	(revision 16835)
+++ wp-admin/includes/template.php	(working copy)
@@ -1536,7 +1536,7 @@
  */
 function iframe_header( $title = '', $limit_styles = false ) {
 	show_admin_bar( false );
-	global $hook_suffix;
+	global $hook_suffix, $current_screen, $wp_locale;
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>>
 <head>
@@ -1547,19 +1547,32 @@
 if ( ! $limit_styles )
 	wp_enqueue_style( 'wp-admin' );
 wp_enqueue_style( 'colors' );
+
+$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 <script type="text/javascript">
 //<![CDATA[
 addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 function tb_close(){var win=window.dialogArguments||opener||parent||top;win.tb_remove();}
+var userSettings = {
+		'url': '<?php echo SITECOOKIEPATH; ?>',
+		'uid': '<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>',
+		'time':'<?php echo time() ?>'
+	},
+	ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>',
+	pagenow = '<?php echo $current_screen->id; ?>',
+	typenow = '<?php if ( isset($current_screen->post_type) ) echo $current_screen->post_type; ?>',
+	adminpage = '<?php echo $admin_body_class; ?>',
+	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
+	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+	isRtl = <?php echo (int) is_rtl(); ?>;
 //]]>
+//]]>
 </script>
 <?php
 do_action('admin_print_styles');
 do_action('admin_print_scripts');
 do_action('admin_head');
-
-$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 ?>
 </head>
 <body<?php if ( isset($GLOBALS['body_id']) ) echo ' id="' . $GLOBALS['body_id'] . '"'; ?>  class="no-js <?php echo $admin_body_class; ?>">
Index: wp-admin/js/media-upload.dev.js
===================================================================
--- wp-admin/js/media-upload.dev.js	(revision 16835)
+++ wp-admin/js/media-upload.dev.js	(working copy)
@@ -46,7 +46,7 @@
 				tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
 		};
 
-		return $('a.thickbox').each( function() {
+		return $('#media-buttons a.thickbox').each( function() {
 			var href = $(this).attr('href');
 			if ( ! href ) return;
 			href = href.replace(/&width=[0-9]+/g, '');
Index: wp-admin/js/plugin-install.dev.js
===================================================================
--- wp-admin/js/plugin-install.dev.js	(revision 16835)
+++ wp-admin/js/plugin-install.dev.js	(working copy)
@@ -1,14 +1,17 @@
 /* Plugin Browser Thickbox related JS*/
 jQuery(document).ready(function($) {
 	var thickDims = function() {
-		var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width;
+		var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
 
+		if ( $('body.admin-bar').length )
+			adminbar_height = 28;
+
 		if ( tbWindow.size() ) {
-			tbWindow.width( W - 50 ).height( H - 45 );
-			$('#TB_iframeContent').width( W - 50 ).height( H - 75 );
+			tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
+			$('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
 			tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
-			if ( ! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) )
-				tbWindow.css({'top':'20px','margin-top':'0'});
+			if ( typeof document.body.style.maxWidth != 'undefined' )
+				tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
 		};
 
 		return $('#dashboard_plugins a.thickbox, .plugins a.thickbox').each( function() {
@@ -17,10 +20,12 @@
 				return;
 			href = href.replace(/&width=[0-9]+/g, '');
 			href = href.replace(/&height=[0-9]+/g, '');
-			$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 ) );
+			$(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
 		});
 	};
 
+	$(window).resize(function(){ thickDims(); });
+
 	thickDims().click( function() {
 		tb_click.call(this);
 
Index: wp-admin/network/index.php
===================================================================
--- wp-admin/network/index.php	(revision 16835)
+++ wp-admin/network/index.php	(working copy)
@@ -35,7 +35,9 @@
 wp_dashboard_setup();
 
 wp_enqueue_script( 'dashboard' );
+wp_enqueue_script( 'plugin-install' );
 wp_admin_css( 'dashboard' );
+wp_admin_css( 'plugin-install' );
 add_thickbox();
 
 add_screen_option('layout_columns', array('max' => 4, 'default' => 2) );
