diff --git a/images/smiley-beard.png b/images/smiley-beard.png
new file mode 100644
index 00000000000..5d4b28463f6
Binary files /dev/null and b/images/smiley-beard.png differ
diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif
index ba90cc36fb0..cee1c1aa3dd 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 74d897a4f6d..06e6ca2c256 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 963a96b8a75..adc12e7c514 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 16f68cc1e91..b444e5781e6 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 716f55e161b..9ff19850d98 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 21c0c653084..6a11e70652d 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 334d49e0e60..9d747140ec2 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 4efd549ed31..cc356611ee2 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 1606c119e75..1bf29de795a 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 ca2451e1027..1e8ccd0f3d3 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 b33d3cca1e7..98186742d2c 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 e6a9e60d5dd..b9bff40a438 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 cb99cdd9136..b074653260b 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 2075dc16058..48867dc2621 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 bef7e257303..28029794f3e 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 00000000000..2a1fccbb725
Binary files /dev/null and b/images/smiley-whitebeard.png differ
diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif
index 9faf1aff8f4..e1cefb05c92 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 648e6e87912..5296c883656 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 e7c95d35c99..5ad0154d7a3 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);