diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 23a5caf2..31a1f655 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -22,12 +22,12 @@ linux=""
 
 
 {% include cardv2.html
-title="Riot.im"
-image="/assets/img/tools/Riot.png"
-description="Riot.im is a decentralized free-software chatting application based on the <a href\"https://matrix.org/\">Matrix</a> protocol, a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. <a href=\"https://github.com/vector-im/riot-web/issues/6779\"><span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The end-to-end encryption is currently in beta and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'\">Experimental <i class=\"far fa-question-circle\"></i></a></span> <a href=\"https://gist.github.com/maxidorius/5736fd09c9194b7a6dc03b6b8d7220d0\"<span class=\"badge badge-danger\" data-toggle=\"tooltip\" title=\"Riot sends a lot of data to matrix.org and vector.im with default settings that aren't trivial to change, also with selfhosted homeservers\">Privacy concerns</span></a>"
-website="https://riot.im/"
-forum="https://forum.privacytools.io/t/discussion-riot-im/665"
-github="https://github.com/vector-im"
+title="Matrix"
+image="/assets/img/tools/Matrix_logo.png"
+description="Matrix is a recent open protocol for real-time communication offering E2E encryption. It can bridge other communications via others protocols such as IRC too. We recommend using clients like <a href='https://riot.im'>Riot</a> or <a href='https://matrix.org/docs/projects/client/weechat-matrix'>weechat-matrix</a> as they offer more established E2E. <a href=\"https://github.com/vector-im/riot-web/issues/6779\"><span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The end-to-end encryption is currently in beta and the mobile client states 'End-to-end encryption is in beta and may not be reliable. You should not yet trust it to secure data.'\">Experimental <i class=\"far fa-question-circle\"></i></a></span> <a href=\"https://gist.github.com/maxidorius/5736fd09c9194b7a6dc03b6b8d7220d0\"<span class=\"badge badge-danger\" data-toggle=\"tooltip\" title=\"Riot sends a lot of data to matrix.org and vector.im with default settings that aren't trivial to change, also with selfhosted homeservers\">Privacy concerns</span></a>"
+website="https://matrix.org/clients/"
+forum=""
+github="https://gitlab.matrix.org/matrix-org"
 android=""
 ios=""
 mac=""
diff --git a/assets/img/tools/Matrix_logo.png b/assets/img/tools/Matrix_logo.png
new file mode 100644
index 00000000..4e4be174
Binary files /dev/null and b/assets/img/tools/Matrix_logo.png differ