diff --git a/contrib/emoticons/default/arrow.gif b/contrib/emoticons/default/arrow.gif
new file mode 100755
index 00000000..2880055c
Binary files /dev/null and b/contrib/emoticons/default/arrow.gif differ
diff --git a/contrib/emoticons/default/biggrin.gif b/contrib/emoticons/default/biggrin.gif
new file mode 100755
index 00000000..d3527723
Binary files /dev/null and b/contrib/emoticons/default/biggrin.gif differ
diff --git a/contrib/emoticons/default/confused.gif b/contrib/emoticons/default/confused.gif
new file mode 100755
index 00000000..0c49e069
Binary files /dev/null and b/contrib/emoticons/default/confused.gif differ
diff --git a/contrib/emoticons/default/cool.gif b/contrib/emoticons/default/cool.gif
new file mode 100755
index 00000000..cead0306
Binary files /dev/null and b/contrib/emoticons/default/cool.gif differ
diff --git a/contrib/emoticons/default/cry.gif b/contrib/emoticons/default/cry.gif
new file mode 100755
index 00000000..7d54b1f9
Binary files /dev/null and b/contrib/emoticons/default/cry.gif differ
diff --git a/contrib/emoticons/default/eek.gif b/contrib/emoticons/default/eek.gif
new file mode 100755
index 00000000..5d397810
Binary files /dev/null and b/contrib/emoticons/default/eek.gif differ
diff --git a/contrib/emoticons/default/evil.gif b/contrib/emoticons/default/evil.gif
new file mode 100755
index 00000000..ab1aa8e1
Binary files /dev/null and b/contrib/emoticons/default/evil.gif differ
diff --git a/contrib/emoticons/default/exclaim.gif b/contrib/emoticons/default/exclaim.gif
new file mode 100755
index 00000000..6e50e2ee
Binary files /dev/null and b/contrib/emoticons/default/exclaim.gif differ
diff --git a/contrib/emoticons/default/frown.gif b/contrib/emoticons/default/frown.gif
new file mode 100755
index 00000000..d2ac78c0
Binary files /dev/null and b/contrib/emoticons/default/frown.gif differ
diff --git a/contrib/emoticons/default/idea.gif b/contrib/emoticons/default/idea.gif
new file mode 100755
index 00000000..a40ae0d7
Binary files /dev/null and b/contrib/emoticons/default/idea.gif differ
diff --git a/contrib/emoticons/default/lol.gif b/contrib/emoticons/default/lol.gif
new file mode 100755
index 00000000..374ba150
Binary files /dev/null and b/contrib/emoticons/default/lol.gif differ
diff --git a/contrib/emoticons/default/mad.gif b/contrib/emoticons/default/mad.gif
new file mode 100755
index 00000000..1f6c3c2f
Binary files /dev/null and b/contrib/emoticons/default/mad.gif differ
diff --git a/contrib/emoticons/default/mrgreen.gif b/contrib/emoticons/default/mrgreen.gif
new file mode 100755
index 00000000..b54cd0f9
Binary files /dev/null and b/contrib/emoticons/default/mrgreen.gif differ
diff --git a/contrib/emoticons/default/neutral.gif b/contrib/emoticons/default/neutral.gif
new file mode 100755
index 00000000..4f311567
Binary files /dev/null and b/contrib/emoticons/default/neutral.gif differ
diff --git a/contrib/emoticons/default/question.gif b/contrib/emoticons/default/question.gif
new file mode 100755
index 00000000..9d072265
Binary files /dev/null and b/contrib/emoticons/default/question.gif differ
diff --git a/contrib/emoticons/default/razz.gif b/contrib/emoticons/default/razz.gif
new file mode 100755
index 00000000..29da2a2f
Binary files /dev/null and b/contrib/emoticons/default/razz.gif differ
diff --git a/contrib/emoticons/default/redface.gif b/contrib/emoticons/default/redface.gif
new file mode 100755
index 00000000..ad762832
Binary files /dev/null and b/contrib/emoticons/default/redface.gif differ
diff --git a/contrib/emoticons/default/rolleyes.gif b/contrib/emoticons/default/rolleyes.gif
new file mode 100755
index 00000000..d7f5f2f4
Binary files /dev/null and b/contrib/emoticons/default/rolleyes.gif differ
diff --git a/contrib/emoticons/default/sad.gif b/contrib/emoticons/default/sad.gif
new file mode 100755
index 00000000..d2ac78c0
Binary files /dev/null and b/contrib/emoticons/default/sad.gif differ
diff --git a/contrib/emoticons/default/smile.gif b/contrib/emoticons/default/smile.gif
new file mode 100755
index 00000000..7b1f6d30
Binary files /dev/null and b/contrib/emoticons/default/smile.gif differ
diff --git a/contrib/emoticons/default/surprised.gif b/contrib/emoticons/default/surprised.gif
new file mode 100755
index 00000000..cb214243
Binary files /dev/null and b/contrib/emoticons/default/surprised.gif differ
diff --git a/contrib/emoticons/default/twisted.gif b/contrib/emoticons/default/twisted.gif
new file mode 100755
index 00000000..502fe247
Binary files /dev/null and b/contrib/emoticons/default/twisted.gif differ
diff --git a/contrib/emoticons/default/wink.gif b/contrib/emoticons/default/wink.gif
new file mode 100755
index 00000000..d1482880
Binary files /dev/null and b/contrib/emoticons/default/wink.gif differ
diff --git a/contrib/emoticons/main.php b/contrib/emoticons/main.php
new file mode 100644
index 00000000..033b8b30
--- /dev/null
+++ b/contrib/emoticons/main.php
@@ -0,0 +1,24 @@
+<?php
+
+class Emoticons extends Extension {
+	public function receive_event($event) {
+		if(is_a($event, 'TextFormattingEvent')) {
+			$event->formatted = $this->bbcode_to_html($event->formatted);
+			$event->stripped  = $this->bbcode_to_text($event->stripped);
+		}
+	}
+	
+	private function bbcode_to_html($text) {
+		global $config;
+		$data_href = $config->get_string("data_href");
+		$text = preg_replace("/:([a-z]*?):/s", "<img src='$data_href/ext/emoticons/default/\\1.gif'>", $text);
+		return $text;
+	}
+
+	private function bbcode_to_text($text) {
+		$text = preg_replace("/:([a-z]*?):/s", "\\1", $text);
+		return $text;
+	}
+}
+add_event_listener(new Emoticons());
+?>