diff --git a/my_theme/static/css/main.css b/my_theme/static/css/main.css
index 8542d41..9bea125 100644
--- a/my_theme/static/css/main.css
+++ b/my_theme/static/css/main.css
@@ -404,39 +404,14 @@ div.figure p.caption, figure p.caption { /* margin provided by figure */
     }
 
         /* Icons */
-        .social a[href*='about.me'] {background-image: url('../images/icons/aboutme.png');}
-        .social a[href*='bitbucket.org'] {background-image: url('../images/icons/bitbucket.png');}
-        .social a[href*='delicious.com'] {background-image: url('../images/icons/delicious.png');}
-        .social a[href*='deviantart.com'] {background-image: url('../images/icons/deviantart.png');}
-        .social a[href*='digg.com'] {background-image: url('../images/icons/digg.png');}
-        .social a[href*='facebook.com'] {background-image: url('../images/icons/facebook.png');}
-        .social a[href*='gitorious.org'] {background-image: url('../images/icons/gitorious.png');}
-        .social a[href*='github.com'],
-        .social a[href*='git.io'] {background-image: url('../images/icons/github.png');}
-        .social a[href*='gittip.com'] {background-image: url('../images/icons/gittip.png');}
-        .social a[href*='hashnode.com'] {background-image: url('../images/icons/hashnode.png');}
-        .social a[href*='plus.google.com'] {background-image: url('../images/icons/google-plus.png');}
-        .social a[href*='groups.google.com'] {background-image: url('../images/icons/google-groups.png');}
-        .social a[href*='news.ycombinator.com'],
-        .social a[href*='hackernewsers.com'] {background-image: url('../images/icons/hackernews.png');}
-        .social a[href*='keybase.io'] {background-image: url('../images/icons/keybase.png');}
-        .social a[href*='last.fm'], .social a[href*='lastfm.'] {background-image: url('../images/icons/lastfm.png');}
         .social a[href*='liberapay.com'] {background-image: url('../images/icons/liberapay.png');}
-        .social a[href*='linkedin.com'] {background-image: url('../images/icons/linkedin.png');}
         .social a[href*='mailto:'] {background-image: url('../images/icons/email.png');}
         .social a[href*='social.polonkai.eu'] {background-image: url('../images/icons/mastodon.png');}
         .social a[href*='paypal.me'] {background-image: url('../images/icons/paypal.png');}
-        .social a[href*='reddit.com'] {background-image: url('../images/icons/reddit.png');}
         .social a[type$='atom+xml'], .social a[type$='rss+xml'] {background-image: url('../images/icons/rss.png');}
-        .social a[href*='skype:'] {background-image: url('../images/icons/skype.png');}
-        .social a[href*='slideshare.net'] {background-image: url('../images/icons/slideshare.png');}
-        .social a[href*='speakerdeck.com'] {background-image: url('../images/icons/speakerdeck.png');}
-        .social a[href*='stackexchange.com'] {background-image: url('../images/icons/stackexchange.png');}
-        .social a[href*='stackoverflow.com'] {background-image: url('../images/icons/stackoverflow.png');}
-        .social a[href*='tumblr.com'] {background-image: url('../images/icons/tumblr.png');}
-        .social a[href*='twitter.com'] {background-image: url('../images/icons/twitter.png');}
-        .social a[href*='vimeo.com'] {background-image: url('../images/icons/vimeo.png');}
-        .social a[href*='youtube.com'] {background-image: url('../images/icons/youtube.png');}
+        .social a[href*='matrix.to'] {background-image: url('../images/icons/matrix.png');}
+        .social a[href*='xmpp:'] {background-image: url('../images/icons/xmpp.png');}
+        .social a[href*='gitea.polonkai.eu'] {background-image: url('../images/icons/gitea.png');}
 
 /*
     About
diff --git a/my_theme/static/images/icons/aboutme.png b/my_theme/static/images/icons/aboutme.png
deleted file mode 100644
index 600110f..0000000
Binary files a/my_theme/static/images/icons/aboutme.png and /dev/null differ
diff --git a/my_theme/static/images/icons/bitbucket.png b/my_theme/static/images/icons/bitbucket.png
deleted file mode 100644
index 277a7df..0000000
Binary files a/my_theme/static/images/icons/bitbucket.png and /dev/null differ
diff --git a/my_theme/static/images/icons/delicious.png b/my_theme/static/images/icons/delicious.png
deleted file mode 100644
index 34868c5..0000000
Binary files a/my_theme/static/images/icons/delicious.png and /dev/null differ
diff --git a/my_theme/static/images/icons/deviantart.png b/my_theme/static/images/icons/deviantart.png
deleted file mode 100644
index 56caf64..0000000
Binary files a/my_theme/static/images/icons/deviantart.png and /dev/null differ
diff --git a/my_theme/static/images/icons/facebook.png b/my_theme/static/images/icons/facebook.png
deleted file mode 100644
index ec345f9..0000000
Binary files a/my_theme/static/images/icons/facebook.png and /dev/null differ
diff --git a/my_theme/static/images/icons/gitea.png b/my_theme/static/images/icons/gitea.png
new file mode 100644
index 0000000..e6ba859
Binary files /dev/null and b/my_theme/static/images/icons/gitea.png differ
diff --git a/my_theme/static/images/icons/github.png b/my_theme/static/images/icons/github.png
deleted file mode 100644
index 5d9109d..0000000
Binary files a/my_theme/static/images/icons/github.png and /dev/null differ
diff --git a/my_theme/static/images/icons/gitorious.png b/my_theme/static/images/icons/gitorious.png
deleted file mode 100644
index a6705d0..0000000
Binary files a/my_theme/static/images/icons/gitorious.png and /dev/null differ
diff --git a/my_theme/static/images/icons/gittip.png b/my_theme/static/images/icons/gittip.png
deleted file mode 100644
index b9f67aa..0000000
Binary files a/my_theme/static/images/icons/gittip.png and /dev/null differ
diff --git a/my_theme/static/images/icons/google-groups.png b/my_theme/static/images/icons/google-groups.png
deleted file mode 100644
index bbd0a0f..0000000
Binary files a/my_theme/static/images/icons/google-groups.png and /dev/null differ
diff --git a/my_theme/static/images/icons/google-plus.png b/my_theme/static/images/icons/google-plus.png
deleted file mode 100644
index 040bd84..0000000
Binary files a/my_theme/static/images/icons/google-plus.png and /dev/null differ
diff --git a/my_theme/static/images/icons/hackernews.png b/my_theme/static/images/icons/hackernews.png
deleted file mode 100644
index 8e05e3e..0000000
Binary files a/my_theme/static/images/icons/hackernews.png and /dev/null differ
diff --git a/my_theme/static/images/icons/hashnode.png b/my_theme/static/images/icons/hashnode.png
deleted file mode 100644
index 190896a..0000000
Binary files a/my_theme/static/images/icons/hashnode.png and /dev/null differ
diff --git a/my_theme/static/images/icons/keybase.png b/my_theme/static/images/icons/keybase.png
deleted file mode 100644
index 6807805..0000000
Binary files a/my_theme/static/images/icons/keybase.png and /dev/null differ
diff --git a/my_theme/static/images/icons/lastfm.png b/my_theme/static/images/icons/lastfm.png
deleted file mode 100644
index 2eedd2d..0000000
Binary files a/my_theme/static/images/icons/lastfm.png and /dev/null differ
diff --git a/my_theme/static/images/icons/linkedin.png b/my_theme/static/images/icons/linkedin.png
deleted file mode 100644
index 13579f0..0000000
Binary files a/my_theme/static/images/icons/linkedin.png and /dev/null differ
diff --git a/my_theme/static/images/icons/matrix.png b/my_theme/static/images/icons/matrix.png
new file mode 100644
index 0000000..b8663a7
Binary files /dev/null and b/my_theme/static/images/icons/matrix.png differ
diff --git a/my_theme/static/images/icons/reddit.png b/my_theme/static/images/icons/reddit.png
deleted file mode 100644
index d826d3e..0000000
Binary files a/my_theme/static/images/icons/reddit.png and /dev/null differ
diff --git a/my_theme/static/images/icons/skype.png b/my_theme/static/images/icons/skype.png
deleted file mode 100644
index 010153e..0000000
Binary files a/my_theme/static/images/icons/skype.png and /dev/null differ
diff --git a/my_theme/static/images/icons/slideshare.png b/my_theme/static/images/icons/slideshare.png
deleted file mode 100644
index 9cbe858..0000000
Binary files a/my_theme/static/images/icons/slideshare.png and /dev/null differ
diff --git a/my_theme/static/images/icons/speakerdeck.png b/my_theme/static/images/icons/speakerdeck.png
deleted file mode 100644
index 7281ec4..0000000
Binary files a/my_theme/static/images/icons/speakerdeck.png and /dev/null differ
diff --git a/my_theme/static/images/icons/stackexchange.png b/my_theme/static/images/icons/stackexchange.png
deleted file mode 100644
index 7debf6b..0000000
Binary files a/my_theme/static/images/icons/stackexchange.png and /dev/null differ
diff --git a/my_theme/static/images/icons/stackoverflow.png b/my_theme/static/images/icons/stackoverflow.png
deleted file mode 100644
index 3c6862e..0000000
Binary files a/my_theme/static/images/icons/stackoverflow.png and /dev/null differ
diff --git a/my_theme/static/images/icons/tumblr.png b/my_theme/static/images/icons/tumblr.png
deleted file mode 100644
index 0417b6f..0000000
Binary files a/my_theme/static/images/icons/tumblr.png and /dev/null differ
diff --git a/my_theme/static/images/icons/twitter.png b/my_theme/static/images/icons/twitter.png
deleted file mode 100644
index 04ddbd2..0000000
Binary files a/my_theme/static/images/icons/twitter.png and /dev/null differ
diff --git a/my_theme/static/images/icons/vimeo.png b/my_theme/static/images/icons/vimeo.png
deleted file mode 100644
index 4b9d721..0000000
Binary files a/my_theme/static/images/icons/vimeo.png and /dev/null differ
diff --git a/my_theme/static/images/icons/xmpp.png b/my_theme/static/images/icons/xmpp.png
new file mode 100644
index 0000000..8190e05
Binary files /dev/null and b/my_theme/static/images/icons/xmpp.png differ
diff --git a/my_theme/static/images/icons/youtube.png b/my_theme/static/images/icons/youtube.png
deleted file mode 100644
index e334e68..0000000
Binary files a/my_theme/static/images/icons/youtube.png and /dev/null differ
diff --git a/pelicanconf.py b/pelicanconf.py
index c76dcfd..58449f9 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -47,17 +47,13 @@ LINKS = (
 
 # Social widget
 SOCIAL = (
-    ('Email', 'mailto:gergely@polonkai.eu'),
-    ('Stack Exchange', 'http://stackexchange.com/users/1369500/gergelypolonkai'),
-    ('Skype', 'skype:gergely.polonkai'),
-    ('Twitter', 'http://twitter.com/GergelyPolonkai'),
-    ('Tumblr', 'http://gergelypolonkai.tumblr.com'),
-    ('deviantArt', 'http://gergelypolonkai.deviantart.com'),
-    ('Hashnode', 'https://hashnode.com/@gergelypolonkai'),
-    ('Keybase', 'https://keybase.io/gergelypolonkai'),
+    ('Matrix', 'https://matrix.to/#/@gergely:polonkai.eu'),
+    ('XMPP', 'xmpp:gergely@polonkai.eu?message'),
+    ('Email', 'mailto:website@gergely.polonkai.eu'),
+    ('Gitea', 'https://gitea.polonkai.eu/gergely/'),
     ('Liberapay', 'https://liberapay.com/gergelypolonkai'),
     ('Mastodon', 'https://social.polonkai.eu/@gergely'),
-    ('Pay me a coffee', 'https://paypal.me/GergelyPolonkai/250'),
+    ('Pay me a coffee', 'https://paypal.me/GergelyPolonkai/330'),
 )
 
 DEFAULT_PAGINATION = 10