diff --git a/images/friendika-48.png b/images/friendika-48.png
new file mode 100644
index 0000000000..f858d9a81a
Binary files /dev/null and b/images/friendika-48.png differ
diff --git a/images/friendika-96.png b/images/friendika-96.png
new file mode 100644
index 0000000000..76a102ef2e
Binary files /dev/null and b/images/friendika-96.png differ
diff --git a/include/bbcode.php b/include/bbcode.php
index 3656f23a9d..7fc1eac1c4 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -78,6 +78,10 @@ function bbcode($Text,$preserve_nl = false) {
 	$Text = preg_replace("/\[td\](.*?)\[\/td\]/s", '<td>$1</td>' ,$Text);
 	$Text = preg_replace("/\[tr\](.*?)\[\/tr\]/s", '<tr>$1</tr>' ,$Text);
 	$Text = preg_replace("/\[table\](.*?)\[\/table\]/s", '<table>$1</table>' ,$Text);
+
+	$Text = preg_replace("/\[table border=1\](.*?)\[\/table\]/s", '<table border="1" >$1</table>' ,$Text);
+	$Text = preg_replace("/\[table border=0\](.*?)\[\/table\]/s", '<table border="0" >$1</table>' ,$Text);
+
 	
 //	$Text = str_replace("[*]", "<li>", $Text);