diff --git a/Makefile b/Makefile
index afbbfdf..6da29e4 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ irc:
 xmpp:
 	$(MAKE) -f protocols/xmpp/Makefile
 
+matrix:
+	$(MAKE) -f protocols/matrix/Makefile
+
 purple:
 ifneq ($(shell uname -m), x86_gcc2)
 	$(MAKE) -f protocols/purple/Makefile
diff --git a/data/icons/protocols/Matrix.rdef b/data/icons/protocols/Matrix.rdef
new file mode 100644
index 0000000..278a275
--- /dev/null
+++ b/data/icons/protocols/Matrix.rdef
@@ -0,0 +1,25 @@
+
+resource vector_icon {
+	$"6E63696601050003020E2040204020C400206020C840216023602260B54C6026"
+	$"CC3C26CC7926CC05B491CBF1B548CBFBB449CBEDB3BBCBE7B402CBEAB3BBC7DA"
+	$"B3BB40B3BBC3CDB3BBBBB3B3BBB399B3BBB7A6B402B395B491B38EB449B392B5"
+	$"48B38426B34426B37A26B3062320B54C2022202020212020B740204020BB8020"
+	$"40204020402040020E5AB3445AB3445AB37ACAF2B38ECA37B384CB38B392CBC5"
+	$"B399CB7EB395CBC5B7A6CBC540CBC5BBB3CBC5C3CDCBC5CBE7CBC5C7DACB7ECB"
+	$"EACAF2CBF1CB38CBEDCA37CBFB5ACC3C5ACC055ACC795D60CA33605E6060605F"
+	$"6060C840604060C40060BB80602060B7405F205D205E20CA33205AB3445AB306"
+	$"5AB3445AB3445AB3445AB3440222BC52BB80BC52BB80BBF3BBB9BB7937BB8DBC"
+	$"04BB35BC93BB1ABBD5BB1ABC7BBB1ABBA2BB1ABB3CBB1ABB6FBAB9BB3CB9F9BB"
+	$"3CBA59BB3CB998BB3CB8D8BB3CB938BB3CB8D8BCC3B8D8BFD1B8D8BE4AB8D844"
+	$"B8D8C466B8D8C2DFB943C466BA1BC466B9AFC466BA86C46635C466BAF2C46635"
+	$"C35D35C14D35C25535BE7DBB9EBDD6BB64BE32BBFABD4EBD1BBD18BC60BD1BBE"
+	$"68BD18BE8AC1A6BE8ABD7EBE8BC2913DC469BE8CC37DBEF7C466BFCAC45FBF60"
+	$"C462C032C45BC103C455C09AC458C108C34AC114C136C10EC240C11EBF0FC151"
+	$"BDCCC132BDFFC198BD4EC2BDBD18C205BD18C34BBD184ABD69C37BBD29C42CBD"
+	$"E4C444C1A6C4403DC444C291C444C469C444C37DC4ADC466C580C45FC516C462"
+	$"C5E8C45BC6B9C455C650C458C6BCC361C6C3C17AC6BFC26DC6CDBE09C62ABC3E"
+	$"C6AEBCFCC59EBB7CC3A7BB20C4F1BB2EC26EBB13C114BC0BC1D9BB49C0EFBC2F"
+	$"C0A7BC78C0CBBC53C089BC52C04EBC08C06CBC2DBFD1BB68BDF5BB1ABF12BB1A"
+	$"BD29BB1ABC52BB80BCEBBB2BBC52BB80BC52BB80BC52BB80BC52BB80030A0001"
+	$"00000A000101000A00010200"
+};
diff --git a/protocols/matrix/Makefile b/protocols/matrix/Makefile
index 6c50252..31506a7 100644
--- a/protocols/matrix/Makefile
+++ b/protocols/matrix/Makefile
@@ -42,7 +42,7 @@ SRCS = \
 #	Specify the resource definition files to use. Full or relative paths can be
 #	used.
 RDEFS = \
-	data/icons/protocols/IRC.rdef \
+	data/icons/protocols/Matrix.rdef \
 	protocols/matrix/matrix.rdef \
 
 #	Specify the resource files to use. Full or relative paths can be used.
@@ -65,7 +65,7 @@ RSRCS =
 #	- 	if your library does not follow the standard library naming scheme,
 #		you need to specify the path to the library and it's name.
 #		(e.g. for mylib.a, specify "mylib.a" or "path/mylib.a")
-LIBS =  be bnetapi localestub matrix_client network $(STDCPPLIBS)
+LIBS =  be bnetapi localestub interface matrix_client network $(STDCPPLIBS)
 
 
 #	Specify additional paths to directories following the standard libXXX.so
diff --git a/protocols/matrix/MatrixApp.cpp b/protocols/matrix/MatrixApp.cpp
index 4cb62f4..94bca1a 100644
--- a/protocols/matrix/MatrixApp.cpp
+++ b/protocols/matrix/MatrixApp.cpp
@@ -12,7 +12,6 @@
 #include <MessageRunner.h>
 #include <Roster.h>
 
-#include <ChatOMatic.h>
 #include <ChatProtocolMessages.h>
 #include <Flags.h>
 #include <UserStatus.h>
diff --git a/protocols/matrix/MatrixProtocol.cpp b/protocols/matrix/MatrixProtocol.cpp
index eb88d4f..f71d768 100644
--- a/protocols/matrix/MatrixProtocol.cpp
+++ b/protocols/matrix/MatrixProtocol.cpp
@@ -158,8 +158,7 @@ MatrixProtocol::Commands()
 BBitmap*
 MatrixProtocol::Icon() const
 {
-	return NULL;
-//	return ReadNodeIcon(fAddOnPath.Path(), B_LARGE_ICON, true);
+	return ReadNodeIcon(fAddOnPath.Path(), B_LARGE_ICON, true);
 }