diff --git a/wp-admin/admin-footer.php b/wp-admin/admin-footer.php
index 14b832b32..d4ac15bc3 100644
--- a/wp-admin/admin-footer.php
+++ b/wp-admin/admin-footer.php
@@ -1,5 +1,5 @@
 
-<div id="footer"><p><a href="http://wordpress.org/"><img src="../wp-images/wp-small.png" alt="WordPress" /></a><br />
+<div id="footer"><p><a href="http://wordpress.org/"><img src="../wp-includes/images/wp-small.png" alt="WordPress" /></a><br />
 <?php bloginfo('version'); ?> <br /> 
 <a href="http://codex.wordpress.org/"><?php _e('Documentation'); ?></a> &#8212; <a href="http://wordpress.org/support/"><?php _e('Support Forums'); ?></a> <br />
 <?php printf(__('%s seconds'), number_format(timer_stop(), 2)); ?>
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index dcd1c23e4..0ca173e00 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -1373,7 +1373,7 @@ function pimp_firefox() {
 		return;
 	$getit = __('WordPress recommends the open-source Firefox browser');
 	echo '
-	<p id="firefoxlink" style="text-align: center;"><a href="http://spreadfirefox.com/community/?q=affiliates&amp;id=2490&amp;t=1" title="' . $getit . '"><img src="../wp-images/get-firefox.png" alt="Get Firefox" /></a></p>
+	<p id="firefoxlink" style="text-align: center;"><a href="http://spreadfirefox.com/community/?q=affiliates&amp;id=2490&amp;t=1" title="' . $getit . '"><img src="images/get-firefox.png" alt="Get Firefox" /></a></p>
 	';
 }
 add_action('admin_footer', 'pimp_firefox');
diff --git a/wp-images/fade-butt.png b/wp-admin/images/fade-butt.png
similarity index 100%
rename from wp-images/fade-butt.png
rename to wp-admin/images/fade-butt.png
diff --git a/wp-images/get-firefox.png b/wp-admin/images/get-firefox.png
similarity index 100%
rename from wp-images/get-firefox.png
rename to wp-admin/images/get-firefox.png
diff --git a/wp-admin/toggle.png b/wp-admin/images/toggle.png
similarity index 100%
rename from wp-admin/toggle.png
rename to wp-admin/images/toggle.png
diff --git a/wp-admin/import-blogger.php b/wp-admin/import-blogger.php
index 19a47fc84..13c007116 100644
--- a/wp-admin/import-blogger.php
+++ b/wp-admin/import-blogger.php
@@ -29,7 +29,7 @@ case "step1":
 </head>
 <body>
 <div class="wrap">
-<h1>Blogger to <img src="../wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
+<h1>Blogger to <img src="../wp-includes/images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
 <p>The importer is running...</p>
 <ul>
 	<li>Importing posts and users
@@ -164,7 +164,7 @@ default:
 
 <body>
 <div class="wrap">
-<h1>Blogger to <img src="../wp-images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
+<h1>Blogger to <img src="../wp-includes/images/wpminilogo.png" width="50" height="50" border="0" alt="WordPress" align="top" /></h1>
 <p>This is a basic Blogger to WordPress import script.</p>
 <p>What it does:</p>
 <ul>
diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css
index a94224ef3..475b4f127 100644
--- a/wp-admin/wp-admin.css
+++ b/wp-admin/wp-admin.css
@@ -228,7 +228,7 @@ textarea, input, select {
 }
 
 .submit input, .submit input:focus, .button {
-	background: url(../wp-images/fade-butt.png);
+	background: url( images/fade-butt.png );
 	border: 3px double #999;
 	border-left-color: #ccc;
 	border-top-color: #ccc;
@@ -432,7 +432,7 @@ table .vers, table .name {
 }
 
 #login h1 {
-	background: url(../wp-images/wp-small.png) no-repeat;
+	background: url(../wp-includes/images/wp-small.png) no-repeat;
 	margin-top: 0;
 }
 
@@ -726,7 +726,7 @@ a.dbx-toggle, a.dbx-toggle:visited {
 	width: 12px;
 	height: 12px;
 	overflow: hidden;
-	background-image: url( toggle.png );
+	background-image: url( images/toggle.png );
 	position: absolute;
 	top: .3em;
 	right: .3em;
diff --git a/wp-images/smilies/icon_arrow.gif b/wp-includes/images/smilies/icon_arrow.gif
similarity index 100%
rename from wp-images/smilies/icon_arrow.gif
rename to wp-includes/images/smilies/icon_arrow.gif
diff --git a/wp-images/smilies/icon_biggrin.gif b/wp-includes/images/smilies/icon_biggrin.gif
similarity index 100%
rename from wp-images/smilies/icon_biggrin.gif
rename to wp-includes/images/smilies/icon_biggrin.gif
diff --git a/wp-images/smilies/icon_confused.gif b/wp-includes/images/smilies/icon_confused.gif
similarity index 100%
rename from wp-images/smilies/icon_confused.gif
rename to wp-includes/images/smilies/icon_confused.gif
diff --git a/wp-images/smilies/icon_cool.gif b/wp-includes/images/smilies/icon_cool.gif
similarity index 100%
rename from wp-images/smilies/icon_cool.gif
rename to wp-includes/images/smilies/icon_cool.gif
diff --git a/wp-images/smilies/icon_cry.gif b/wp-includes/images/smilies/icon_cry.gif
similarity index 100%
rename from wp-images/smilies/icon_cry.gif
rename to wp-includes/images/smilies/icon_cry.gif
diff --git a/wp-images/smilies/icon_eek.gif b/wp-includes/images/smilies/icon_eek.gif
similarity index 100%
rename from wp-images/smilies/icon_eek.gif
rename to wp-includes/images/smilies/icon_eek.gif
diff --git a/wp-images/smilies/icon_evil.gif b/wp-includes/images/smilies/icon_evil.gif
similarity index 100%
rename from wp-images/smilies/icon_evil.gif
rename to wp-includes/images/smilies/icon_evil.gif
diff --git a/wp-images/smilies/icon_exclaim.gif b/wp-includes/images/smilies/icon_exclaim.gif
similarity index 100%
rename from wp-images/smilies/icon_exclaim.gif
rename to wp-includes/images/smilies/icon_exclaim.gif
diff --git a/wp-images/smilies/icon_idea.gif b/wp-includes/images/smilies/icon_idea.gif
similarity index 100%
rename from wp-images/smilies/icon_idea.gif
rename to wp-includes/images/smilies/icon_idea.gif
diff --git a/wp-images/smilies/icon_lol.gif b/wp-includes/images/smilies/icon_lol.gif
similarity index 100%
rename from wp-images/smilies/icon_lol.gif
rename to wp-includes/images/smilies/icon_lol.gif
diff --git a/wp-images/smilies/icon_mad.gif b/wp-includes/images/smilies/icon_mad.gif
similarity index 100%
rename from wp-images/smilies/icon_mad.gif
rename to wp-includes/images/smilies/icon_mad.gif
diff --git a/wp-images/smilies/icon_mrgreen.gif b/wp-includes/images/smilies/icon_mrgreen.gif
similarity index 100%
rename from wp-images/smilies/icon_mrgreen.gif
rename to wp-includes/images/smilies/icon_mrgreen.gif
diff --git a/wp-images/smilies/icon_neutral.gif b/wp-includes/images/smilies/icon_neutral.gif
similarity index 100%
rename from wp-images/smilies/icon_neutral.gif
rename to wp-includes/images/smilies/icon_neutral.gif
diff --git a/wp-images/smilies/icon_question.gif b/wp-includes/images/smilies/icon_question.gif
similarity index 100%
rename from wp-images/smilies/icon_question.gif
rename to wp-includes/images/smilies/icon_question.gif
diff --git a/wp-images/smilies/icon_razz.gif b/wp-includes/images/smilies/icon_razz.gif
similarity index 100%
rename from wp-images/smilies/icon_razz.gif
rename to wp-includes/images/smilies/icon_razz.gif
diff --git a/wp-images/smilies/icon_redface.gif b/wp-includes/images/smilies/icon_redface.gif
similarity index 100%
rename from wp-images/smilies/icon_redface.gif
rename to wp-includes/images/smilies/icon_redface.gif
diff --git a/wp-images/smilies/icon_rolleyes.gif b/wp-includes/images/smilies/icon_rolleyes.gif
similarity index 100%
rename from wp-images/smilies/icon_rolleyes.gif
rename to wp-includes/images/smilies/icon_rolleyes.gif
diff --git a/wp-images/smilies/icon_sad.gif b/wp-includes/images/smilies/icon_sad.gif
similarity index 100%
rename from wp-images/smilies/icon_sad.gif
rename to wp-includes/images/smilies/icon_sad.gif
diff --git a/wp-images/smilies/icon_smile.gif b/wp-includes/images/smilies/icon_smile.gif
similarity index 100%
rename from wp-images/smilies/icon_smile.gif
rename to wp-includes/images/smilies/icon_smile.gif
diff --git a/wp-images/smilies/icon_surprised.gif b/wp-includes/images/smilies/icon_surprised.gif
similarity index 100%
rename from wp-images/smilies/icon_surprised.gif
rename to wp-includes/images/smilies/icon_surprised.gif
diff --git a/wp-images/smilies/icon_twisted.gif b/wp-includes/images/smilies/icon_twisted.gif
similarity index 100%
rename from wp-images/smilies/icon_twisted.gif
rename to wp-includes/images/smilies/icon_twisted.gif
diff --git a/wp-images/smilies/icon_wink.gif b/wp-includes/images/smilies/icon_wink.gif
similarity index 100%
rename from wp-images/smilies/icon_wink.gif
rename to wp-includes/images/smilies/icon_wink.gif
diff --git a/wp-images/wp-small.png b/wp-includes/images/wp-small.png
similarity index 100%
rename from wp-images/wp-small.png
rename to wp-includes/images/wp-small.png
diff --git a/wp-images/wpminilogo.png b/wp-includes/images/wpminilogo.png
similarity index 100%
rename from wp-images/wpminilogo.png
rename to wp-includes/images/wpminilogo.png
