diff --git a/images/smiley-beard.png b/images/smiley-beard.png
new file mode 100644
index 0000000000..5d4b28463f
Binary files /dev/null and b/images/smiley-beard.png differ
diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif
index ba90cc36fb..cee1c1aa3d 100755
Binary files a/images/smiley-cool.gif and b/images/smiley-cool.gif differ
diff --git a/images/smiley-cry.gif b/images/smiley-cry.gif
index 74d897a4f6..06e6ca2c25 100755
Binary files a/images/smiley-cry.gif and b/images/smiley-cry.gif differ
diff --git a/images/smiley-embarassed.gif b/images/smiley-embarassed.gif
index 963a96b8a7..adc12e7c51 100755
Binary files a/images/smiley-embarassed.gif and b/images/smiley-embarassed.gif differ
diff --git a/images/smiley-foot-in-mouth.gif b/images/smiley-foot-in-mouth.gif
index 16f68cc1e9..b444e5781e 100755
Binary files a/images/smiley-foot-in-mouth.gif and b/images/smiley-foot-in-mouth.gif differ
diff --git a/images/smiley-frown.gif b/images/smiley-frown.gif
index 716f55e161..9ff19850d9 100755
Binary files a/images/smiley-frown.gif and b/images/smiley-frown.gif differ
diff --git a/images/smiley-heart.gif b/images/smiley-heart.gif
index 21c0c65308..6a11e70652 100755
Binary files a/images/smiley-heart.gif and b/images/smiley-heart.gif differ
diff --git a/images/smiley-innocent.gif b/images/smiley-innocent.gif
index 334d49e0e6..9d747140ec 100755
Binary files a/images/smiley-innocent.gif and b/images/smiley-innocent.gif differ
diff --git a/images/smiley-kiss.gif b/images/smiley-kiss.gif
index 4efd549ed3..cc356611ee 100755
Binary files a/images/smiley-kiss.gif and b/images/smiley-kiss.gif differ
diff --git a/images/smiley-laughing.gif b/images/smiley-laughing.gif
index 1606c119e7..1bf29de795 100755
Binary files a/images/smiley-laughing.gif and b/images/smiley-laughing.gif differ
diff --git a/images/smiley-money-mouth.gif b/images/smiley-money-mouth.gif
index ca2451e102..1e8ccd0f3d 100755
Binary files a/images/smiley-money-mouth.gif and b/images/smiley-money-mouth.gif differ
diff --git a/images/smiley-sealed.gif b/images/smiley-sealed.gif
index b33d3cca1e..98186742d2 100755
Binary files a/images/smiley-sealed.gif and b/images/smiley-sealed.gif differ
diff --git a/images/smiley-smile.gif b/images/smiley-smile.gif
index e6a9e60d5d..b9bff40a43 100755
Binary files a/images/smiley-smile.gif and b/images/smiley-smile.gif differ
diff --git a/images/smiley-surprised.gif b/images/smiley-surprised.gif
index cb99cdd913..b074653260 100755
Binary files a/images/smiley-surprised.gif and b/images/smiley-surprised.gif differ
diff --git a/images/smiley-tongue-out.gif b/images/smiley-tongue-out.gif
index 2075dc1605..48867dc262 100755
Binary files a/images/smiley-tongue-out.gif and b/images/smiley-tongue-out.gif differ
diff --git a/images/smiley-undecided.gif b/images/smiley-undecided.gif
index bef7e25730..28029794f3 100755
Binary files a/images/smiley-undecided.gif and b/images/smiley-undecided.gif differ
diff --git a/images/smiley-whitebeard.png b/images/smiley-whitebeard.png
new file mode 100644
index 0000000000..2a1fccbb72
Binary files /dev/null and b/images/smiley-whitebeard.png differ
diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif
index 9faf1aff8f..e1cefb05c9 100755
Binary files a/images/smiley-wink.gif and b/images/smiley-wink.gif differ
diff --git a/images/smiley-yell.gif b/images/smiley-yell.gif
index 648e6e8791..5296c88365 100755
Binary files a/images/smiley-yell.gif and b/images/smiley-yell.gif differ
diff --git a/include/text.php b/include/text.php
index e7c95d35c9..5ad0154d7a 100644
--- a/include/text.php
+++ b/include/text.php
@@ -782,8 +782,8 @@ function smilies($s, $sample = false) {
 		'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
 		'<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
 //		'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
-		'<img src="' . $a->get_baseurl() . '/images/beard.jpg" alt=":beard" />',
-		'<img src="' . $a->get_baseurl() . '/images/whitebeard.jpg" alt=":whitebeard" />'
+		'<img src="' . $a->get_baseurl() . '/images/smiley-beard.png" alt=":beard" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-whitebeard.png" alt=":whitebeard" />'
 	);
 
 	$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);