diff --git a/images/beard.jpg b/images/beard.jpg
deleted file mode 100644
index d65e0c33b..000000000
Binary files a/images/beard.jpg and /dev/null differ
diff --git a/images/smiley-beard.png b/images/smiley-beard.png
new file mode 100644
index 000000000..5d4b28463
Binary files /dev/null and b/images/smiley-beard.png differ
diff --git a/images/smiley-cool.gif b/images/smiley-cool.gif
index ba90cc36f..cee1c1aa3 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 74d897a4f..06e6ca2c2 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 963a96b8a..adc12e7c5 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 16f68cc1e..b444e5781 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 716f55e16..9ff19850d 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 21c0c6530..6a11e7065 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 334d49e0e..9d747140e 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 4efd549ed..cc356611e 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 1606c119e..1bf29de79 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 ca2451e10..1e8ccd0f3 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 b33d3cca1..98186742d 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 e6a9e60d5..b9bff40a4 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 cb99cdd91..b07465326 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 2075dc160..48867dc26 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 bef7e2573..28029794f 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 000000000..2a1fccbb7
Binary files /dev/null and b/images/smiley-whitebeard.png differ
diff --git a/images/smiley-wink.gif b/images/smiley-wink.gif
index 9faf1aff8..e1cefb05c 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 648e6e879..5296c8836 100755
Binary files a/images/smiley-yell.gif and b/images/smiley-yell.gif differ
diff --git a/images/whitebeard.jpg b/images/whitebeard.jpg
deleted file mode 100644
index 363eba6a5..000000000
Binary files a/images/whitebeard.jpg and /dev/null differ
diff --git a/include/text.php b/include/text.php
index e7c95d35c..5ad0154d7 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);
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl
index 3a36e7daa..027a8b7b7 100644
--- a/view/theme/diabook/nav.tpl
+++ b/view/theme/diabook/nav.tpl
@@ -142,6 +142,10 @@
 <div style="position: fixed; bottom: 5px; left: 25px;">$langselector</div>
 <div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div>
 
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
 
 {#