diff --git a/_config.yml b/_config.yml
index 5771955..568818f 100644
--- a/_config.yml
+++ b/_config.yml
@@ -3,8 +3,9 @@ title: "ChronosX88"
 description: "ChronosX88's personal website"
 
 github_username: ChronosX88
-twitter_username: ChronosX88
 telegram_username: ChronosX
+mastodon_url: https://mstdn.netwhood.online/@ChronosX88
+mastodon_username: ChronosX88
 
 baseurl: ""
 url: "https://chronosx88.github.io"
diff --git a/_includes/footer.html b/_includes/footer.html
index f4bc1fa..ff99447 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -3,7 +3,7 @@
   {{ site.title }}/{{ page.permalink_name | replace: "/", "" | replace: " ", "-" }}
   <br><br>
   {% if site.github_username and site.github_username != "" %} :octocat: <a href="https://github.com/{{site.github_username}}">@{{ site.github_username }}</a> {% endif %}
-  {% if site.twitter_username and site.twitter_username != "" %} <img src="{{ '/assets/twitter_icon.svg' | relative_url }}" width="16wv"> <a href="https://twitter.com/{{site.twitter_username}}">@{{ site.twitter_username }}</a> {% endif %}
+  {% if site.mastodon_url and site.mastodon_url != "" %} <img src="{{ '/assets/mastodon_icon.png' | relative_url }}" width="16wv"> <a href="{{site.mastodon_url}}">@{{ site.mastodon_username }}</a> {% endif %}
   {% if site.telegram_username and site.telegram_username != "" %} <img src="{{ '/assets/telegram_icon.png' | relative_url }}" width="16wv"> <a href="https://t.me/{{site.telegram_username}}">@{{ site.telegram_username }}</a> {% endif %}
 
 </footer>
diff --git a/assets/mastodon_icon.png b/assets/mastodon_icon.png
new file mode 100644
index 0000000..55fefc3
Binary files /dev/null and b/assets/mastodon_icon.png differ
diff --git a/assets/twitter_icon.svg b/assets/twitter_icon.svg
deleted file mode 100644
index f4a3e40..0000000
--- a/assets/twitter_icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Creator: CorelDRAW X6 -->
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="70.5556mm" height="57.3391mm" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" viewBox="0 0 6701 5446" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs>
-  <style type="text/css">
-   <![CDATA[
-    .fil0 {fill:#41ABE1}
-   ]]>
-  </style>
- </defs>
- <g id="Livello_x0020_1">
-  <metadata id="CorelCorpID_0Corel-Layer"/>
-  <path class="fil0" d="M6701 645c-247,109 -512,183 -790,216 284,-170 502,-440 604,-761 -266,158 -560,272 -873,334 -251,-267 -608,-434 -1004,-434 -759,0 -1375,616 -1375,1375 0,108 12,213 36,313 -1143,-57 -2156,-605 -2834,-1437 -118,203 -186,439 -186,691 0,477 243,898 612,1144 -225,-7 -437,-69 -623,-172 0,6 0,11 0,17 0,666 474,1222 1103,1348 -115,31 -237,48 -362,48 -89,0 -175,-9 -259,-25 175,546 683,944 1284,955 -471,369 -1063,589 -1708,589 -111,0 -220,-7 -328,-19 608,390 1331,618 2108,618 2529,0 3912,-2095 3912,-3912 0,-60 -1,-119 -4,-178 269,-194 502,-436 686,-712z"/>
- </g>
-<script xmlns=""/></svg>
\ No newline at end of file