diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index bb370c24fd..3984a3164f 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2607,63 +2607,50 @@ function smilies_init() {
 
 	if ( !isset( $wpsmiliestrans ) ) {
 		$wpsmiliestrans = array(
-		':mrgreen:' => 'mrgreen.png',
-		':neutral:' => 'face-plain.png',
-		':twisted:' => 'face-devilish.png',
-		 ':monkey:' => 'face-monkey.png',
-		  ':angel:' => 'face-angel.png',
-		  ':arrow:' => 'stock_right.png',
-		  ':devil:' => 'face-devilish.png',
-		  ':shock:' => 'face-surprise.png',
-		  ':smile:' => 'face-smile.png',
-		  ':smirk:' => 'face-smirk.png',
-		    ':???:' => 'face-worried.png',
-		   ':cool:' => 'face-cool.png',
-		   ':evil:' => 'face-devilish.png',
-		   ':grin:' => 'face-smile-big.png',
-		   ':idea:' => 'dialog-information.png',
-		   ':kiss:' => 'face-kiss.png',
-		   ':oops:' => 'face-embarrassed.png',
-		   ':razz:' => 'face-raspberry.png',
-		   ':roll:' => 'face-raspberry.png',
-		   ':wink:' => 'face-wink.png',
-		    ':cry:' => 'face-crying.png',
-		    ':eek:' => 'face-surprise.png',
-		    ':lol:' => 'face-laugh.png',
-		    ':mad:' => 'face-angry.png',
-		    ':sad:' => 'face-sad.png',
-		     'O:-)' => 'face-angel.png',
-		      'O:)' => 'face-angel.png',
-		      '8-)' => 'face-cool.png',
-		      '8-O' => 'face-surprise.png',
-		      ':-(' => 'face-sad.png',
-		      ':-)' => 'face-smile.png',
-		      ':-?' => 'face-worried.png',
-		      ':-D' => 'face-smile-big.png',
-		      ':-P' => 'face-raspberry.png',
-		      ':-o' => 'face-surprise.png',
-		      ':-x' => 'face-angry.png',
-		      ':-|' => 'face-plain.png',
-		      ';-)' => 'face-wink.png',
-		      ';-,' => 'face-smirk.png',
-		      ':-/' => 'face-uncertain.png',
-		     ':-\\' => 'face-uncertain.png',
-		       '8)' => 'face-cool.png',
-		       '8O' => 'face-surprise.png',
-		       ':(' => 'face-sad.png',
-		       ':)' => 'face-smile.png',
-		       ':?' => 'face-worried.png',
-		       ':D' => 'face-smile-big.png',
-		       ':P' => 'face-raspberry.png',
-		       ':o' => 'face-surprise.png',
-		       ':x' => 'face-angry.png',
-		       ':|' => 'face-plain.png',
-		       ';)' => 'face-wink.png',
-		       ';,' => 'face-smirk.png',
-		       ':/' => 'face-uncertain.png',
-		      ':\\' => 'face-uncertain.png',
-		      ':!:' => 'dialog-warning.png',
-		      ':?:' => 'help-browser.png',
+		':mrgreen:' => 'icon_mrgreen.gif',
+		':neutral:' => 'icon_neutral.gif',
+		':twisted:' => 'icon_twisted.gif',
+		  ':arrow:' => 'icon_arrow.gif',
+		  ':shock:' => 'icon_eek.gif',
+		  ':smile:' => 'icon_smile.gif',
+		    ':???:' => 'icon_confused.gif',
+		   ':cool:' => 'icon_cool.gif',
+		   ':evil:' => 'icon_evil.gif',
+		   ':grin:' => 'icon_biggrin.gif',
+		   ':idea:' => 'icon_idea.gif',
+		   ':oops:' => 'icon_redface.gif',
+		   ':razz:' => 'icon_razz.gif',
+		   ':roll:' => 'icon_rolleyes.gif',
+		   ':wink:' => 'icon_wink.gif',
+		    ':cry:' => 'icon_cry.gif',
+		    ':eek:' => 'icon_surprised.gif',
+		    ':lol:' => 'icon_lol.gif',
+		    ':mad:' => 'icon_mad.gif',
+		    ':sad:' => 'icon_sad.gif',
+		      '8-)' => 'icon_cool.gif',
+		      '8-O' => 'icon_eek.gif',
+		      ':-(' => 'icon_sad.gif',
+		      ':-)' => 'icon_smile.gif',
+		      ':-?' => 'icon_confused.gif',
+		      ':-D' => 'icon_biggrin.gif',
+		      ':-P' => 'icon_razz.gif',
+		      ':-o' => 'icon_surprised.gif',
+		      ':-x' => 'icon_mad.gif',
+		      ':-|' => 'icon_neutral.gif',
+		      ';-)' => 'icon_wink.gif',
+		       '8)' => 'icon_cool.gif',
+		       '8O' => 'icon_eek.gif',
+		       ':(' => 'icon_sad.gif',
+		       ':)' => 'icon_smile.gif',
+		       ':?' => 'icon_confused.gif',
+		       ':D' => 'icon_biggrin.gif',
+		       ':P' => 'icon_razz.gif',
+		       ':o' => 'icon_surprised.gif',
+		       ':x' => 'icon_mad.gif',
+		       ':|' => 'icon_neutral.gif',
+		       ';)' => 'icon_wink.gif',
+		      ':!:' => 'icon_exclaim.gif',
+		      ':?:' => 'icon_question.gif',
 		);
 	}
 
diff --git a/wp-includes/images/smilies/dialog-information.png b/wp-includes/images/smilies/dialog-information.png
deleted file mode 100644
index 8851b99ba1..0000000000
Binary files a/wp-includes/images/smilies/dialog-information.png and /dev/null differ
diff --git a/wp-includes/images/smilies/dialog-warning.png b/wp-includes/images/smilies/dialog-warning.png
deleted file mode 100644
index a9e4ff3991..0000000000
Binary files a/wp-includes/images/smilies/dialog-warning.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-angel.png b/wp-includes/images/smilies/face-angel.png
deleted file mode 100644
index 27d6ca54be..0000000000
Binary files a/wp-includes/images/smilies/face-angel.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-angry.png b/wp-includes/images/smilies/face-angry.png
deleted file mode 100644
index 93f5a58f2f..0000000000
Binary files a/wp-includes/images/smilies/face-angry.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-cool.png b/wp-includes/images/smilies/face-cool.png
deleted file mode 100644
index cc4bea9743..0000000000
Binary files a/wp-includes/images/smilies/face-cool.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-crying.png b/wp-includes/images/smilies/face-crying.png
deleted file mode 100644
index 079c688844..0000000000
Binary files a/wp-includes/images/smilies/face-crying.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-devilish.png b/wp-includes/images/smilies/face-devilish.png
deleted file mode 100644
index 20c1495c33..0000000000
Binary files a/wp-includes/images/smilies/face-devilish.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-embarrassed.png b/wp-includes/images/smilies/face-embarrassed.png
deleted file mode 100644
index 2ea4da9d30..0000000000
Binary files a/wp-includes/images/smilies/face-embarrassed.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-kiss.png b/wp-includes/images/smilies/face-kiss.png
deleted file mode 100644
index 81c93a7a41..0000000000
Binary files a/wp-includes/images/smilies/face-kiss.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-laugh.png b/wp-includes/images/smilies/face-laugh.png
deleted file mode 100644
index 5ff548b855..0000000000
Binary files a/wp-includes/images/smilies/face-laugh.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-monkey.png b/wp-includes/images/smilies/face-monkey.png
deleted file mode 100644
index dccb4faa94..0000000000
Binary files a/wp-includes/images/smilies/face-monkey.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-plain.png b/wp-includes/images/smilies/face-plain.png
deleted file mode 100644
index ba949661cf..0000000000
Binary files a/wp-includes/images/smilies/face-plain.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-raspberry.png b/wp-includes/images/smilies/face-raspberry.png
deleted file mode 100644
index 154eea0dc4..0000000000
Binary files a/wp-includes/images/smilies/face-raspberry.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-sad.png b/wp-includes/images/smilies/face-sad.png
deleted file mode 100644
index a86e6f9bab..0000000000
Binary files a/wp-includes/images/smilies/face-sad.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-smile-big.png b/wp-includes/images/smilies/face-smile-big.png
deleted file mode 100644
index e6ddae5f42..0000000000
Binary files a/wp-includes/images/smilies/face-smile-big.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-smile.png b/wp-includes/images/smilies/face-smile.png
deleted file mode 100644
index 361d70545f..0000000000
Binary files a/wp-includes/images/smilies/face-smile.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-smirk.png b/wp-includes/images/smilies/face-smirk.png
deleted file mode 100644
index 37bff1b009..0000000000
Binary files a/wp-includes/images/smilies/face-smirk.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-surprise.png b/wp-includes/images/smilies/face-surprise.png
deleted file mode 100644
index 8295b91353..0000000000
Binary files a/wp-includes/images/smilies/face-surprise.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-uncertain.png b/wp-includes/images/smilies/face-uncertain.png
deleted file mode 100644
index 3438064b38..0000000000
Binary files a/wp-includes/images/smilies/face-uncertain.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-wink.png b/wp-includes/images/smilies/face-wink.png
deleted file mode 100644
index 96f3af6c7f..0000000000
Binary files a/wp-includes/images/smilies/face-wink.png and /dev/null differ
diff --git a/wp-includes/images/smilies/face-worried.png b/wp-includes/images/smilies/face-worried.png
deleted file mode 100644
index 36f3f1a4ed..0000000000
Binary files a/wp-includes/images/smilies/face-worried.png and /dev/null differ
diff --git a/wp-includes/images/smilies/help-browser.png b/wp-includes/images/smilies/help-browser.png
deleted file mode 100644
index f25fc3fbf1..0000000000
Binary files a/wp-includes/images/smilies/help-browser.png and /dev/null differ
diff --git a/wp-includes/images/smilies/mrgreen.png b/wp-includes/images/smilies/mrgreen.png
deleted file mode 100644
index fce7208a6d..0000000000
Binary files a/wp-includes/images/smilies/mrgreen.png and /dev/null differ
diff --git a/wp-includes/images/smilies/stock_right.png b/wp-includes/images/smilies/stock_right.png
deleted file mode 100644
index 6ef8de76e0..0000000000
Binary files a/wp-includes/images/smilies/stock_right.png and /dev/null differ