diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 0a721cf29e..e639e86d0e 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -60,8 +60,8 @@ if (isset($plugin_page)) {
 	if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) {
 		$page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
 		// backwards compatibility for plugins using add_management_page
-		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'import.php') ) {
-			wp_redirect('import.php?page=' . $plugin_page);
+		if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
+			wp_redirect('tool.php?page=' . $plugin_page);
 			exit;
 		}
 	}
@@ -112,7 +112,7 @@ if (isset($plugin_page)) {
 		include(ABSPATH . "wp-admin/import/$importer.php");
 	}
 
-	$parent_file = 'import.php';
+	$parent_file = 'tools.php';
 	$submenu_file = 'import.php';
 	$title = __('Import');
 
diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css
index 1f3807d33c..ff6c3b206d 100644
--- a/wp-admin/css/colors-fresh.css
+++ b/wp-admin/css/colors-fresh.css
@@ -1587,7 +1587,7 @@ form p.submit a.cancel:hover {
 	background: transparent url(../images/icons32.png) no-repeat -600px -5px;
 }
 
-#icon-import,
+#icon-tools,
 #icon-admin {
 	background: transparent url(../images/icons32.png) no-repeat -432px -5px;
 }
diff --git a/wp-admin/import.php b/wp-admin/import.php
index a2f37c328d..64408f0332 100644
--- a/wp-admin/import.php
+++ b/wp-admin/import.php
@@ -10,6 +10,7 @@
 require_once ('admin.php');
 $title = __('Import');
 require_once ('admin-header.php');
+$parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index f126d3bc60..5b1a635fa7 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -625,7 +625,7 @@ function add_submenu_page( $parent, $page_title, $menu_title, $access_level, $fi
  * @return unknown
  */
 function add_management_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
-	return add_submenu_page( 'import.php', $page_title, $menu_title, $access_level, $file, $function );
+	return add_submenu_page( 'tools.php', $page_title, $menu_title, $access_level, $file, $function );
 }
 
 function add_options_page( $page_title, $menu_title, $access_level, $file, $function = '' ) {
@@ -1032,4 +1032,4 @@ function settings_fields($option_group) {
 	wp_nonce_field("$option_group-options");
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/wp-admin/menu.php b/wp-admin/menu.php
index c8ccf9b8a3..3c4157d76f 100644
--- a/wp-admin/menu.php
+++ b/wp-admin/menu.php
@@ -83,12 +83,11 @@ if ( current_user_can('edit_users') ) {
 	$submenu['profile.php'][5] = array(__('Your Profile'), 'read', 'profile.php');
 }
 
-$menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', 'menu-top', 'menu-tools', 'div' );
-	$submenu['import.php'][5] = array( __('Import'), 'import', 'import.php' );
-	$submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' );
-	if ( ! $is_opera )
-		$submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' );
-	$submenu['import.php'][30] = array( __('Upgrade'), 'install_plugins',  'update-core.php');
+$menu[45] = array( __('Tools'), 'manage_options', 'tools.php', '', 'menu-top', 'menu-tools', 'div' );
+	$submenu['tools.php'][5] = array( __('Tools'), 'read', 'tools.php' );
+	$submenu['tools.php'][10] = array( __('Import'), 'import', 'import.php' );
+	$submenu['tools.php'][15] = array( __('Export'), 'import', 'export.php' );
+	$submenu['tools.php'][20] = array( __('Upgrade'), 'install_plugins',  'update-core.php');
 
 $menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top', 'menu-settings', 'div' );
 	$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
diff --git a/wp-admin/options-writing.php b/wp-admin/options-writing.php
index 63fda90e6c..ede84ebf3f 100644
--- a/wp-admin/options-writing.php
+++ b/wp-admin/options-writing.php
@@ -126,9 +126,6 @@ wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_email_categor
 
 <?php endif; ?>
 
-<h3><?php _e('Press This') ?></h3>
-<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
-
 <?php do_settings_sections('writing'); ?>
 
 <p class="submit">
diff --git a/wp-admin/turbo.php b/wp-admin/tools.php
similarity index 87%
rename from wp-admin/turbo.php
rename to wp-admin/tools.php
index 1f4885178c..1a6ac0438d 100644
--- a/wp-admin/turbo.php
+++ b/wp-admin/tools.php
@@ -9,16 +9,19 @@
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
 
-$title = __('Turbo');
+$title = __('Tools');
 wp_enqueue_script( 'wp-gears' );
 
 require_once('admin-header.php');
 
+screen_icon();
+?>
+<h2><?php echo wp_specialchars( $title ); ?></h2> 
+<?php
 if ( ! $is_opera ) {
 ?>
 	<div id="gears-info-box" class="wrap">
-	<?php screen_icon(); ?>
-	<h2><?php echo wp_specialchars( $title ); ?></h2> 
+	<h3><?php _e('Turbo'); ?></h3> 
 
 	<img src="images/gear.png" title="Gear" alt="" class="gears-img" />
 	<div id="gears-msg1">
@@ -78,6 +81,10 @@ if ( ! $is_opera ) {
 <?php } else {
 	_e('Turbo is not available for your browser.');
 }
+?>
+<h3><?php _e('Press This') ?></h3>
+<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?>  <a href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
 
+<?php
 include('admin-footer.php');
 ?>
\ No newline at end of file