diff --git a/docs/src/_data/links.json b/docs/src/_data/links.json
index 870744392e7..84374f9de97 100644
--- a/docs/src/_data/links.json
+++ b/docs/src/_data/links.json
@@ -3,7 +3,8 @@
     "twitter": "https://twitter.com/geteslint",
     "chat": "https://eslint.org/chat",
     "group": "https://groups.google.com/group/eslint",
-
+    "mastodon": "https://fosstodon.org/@eslint",
+    
     "blog": "/blog",
     "docs": "/docs/latest/",
     "playground": "/play",
diff --git a/docs/src/_data/sites/en.yml b/docs/src/_data/sites/en.yml
index 43e112fe1b0..54acee319fe 100644
--- a/docs/src/_data/sites/en.yml
+++ b/docs/src/_data/sites/en.yml
@@ -76,6 +76,7 @@ footer:
     chat: Discord
     mailing_list: Google Group
     github: GitHub
+    mastodon: Mastodon
   theme_switcher:
     title: Theme Switcher
     light: Light
diff --git a/docs/src/_includes/components/social-icons.html b/docs/src/_includes/components/social-icons.html
index b75b75f8273..1278f5d0f9d 100644
--- a/docs/src/_includes/components/social-icons.html
+++ b/docs/src/_includes/components/social-icons.html
@@ -2,7 +2,7 @@
     <h2 id="eslint-social-label" hidden>{{ site.footer.social_icons.title }}</h2>
     <ul role="list">
         <li>
-            <a href="{{ links.twitter }}" target="_blank">
+            <a href="{{ links.twitter }}" rel="noopener noreferrer" target="_blank">
                 <svg width="24" height="25" viewBox="0 0 24 25" class="c-icon" role="img"
                     aria-label="{{ site.footer.social_icons.twitter }}">
                     <path
@@ -12,7 +12,7 @@ <h2 id="eslint-social-label" hidden>{{ site.footer.social_icons.title }}</h2>
             </a>
         </li>
         <li>
-            <a href="{{ links.group }}" target="_blank">
+            <a href="{{ links.group }}" rel="noopener noreferrer" target="_blank">
                 <svg width="24" height="25" viewBox="0 0 24 25" class="c-icon" role="img"
                     aria-label="{{ site.footer.social_icons.mailing_list }}">
                     <path
@@ -22,7 +22,7 @@ <h2 id="eslint-social-label" hidden>{{ site.footer.social_icons.title }}</h2>
             </a>
         </li>
         <li>
-            <a href="{{ links.github }}" target="_blank">
+            <a href="{{ links.github }}" rel="noopener noreferrer" target="_blank">
                 <svg width="25" height="24" viewBox="0 0 25 24" class="c-icon" role="img"
                     aria-label="{{ site.footer.social_icons.github }}">
                     <path fill-rule="evenodd" clip-rule="evenodd"
@@ -32,7 +32,7 @@ <h2 id="eslint-social-label" hidden>{{ site.footer.social_icons.title }}</h2>
             </a>
         </li>
         <li>
-            <a href="{{ links.chat }}" target="_blank">
+            <a href="{{ links.chat }}" rel="noopener noreferrer" target="_blank">
                 <svg width="24" height="25" viewBox="0 0 24 25" class="c-icon" role="img"
                     aria-label="{{ site.footer.social_icons.chat }}">
                     <g clip-path="url(#clip0_256:2722)">
@@ -52,6 +52,13 @@ <h2 id="eslint-social-label" hidden>{{ site.footer.social_icons.title }}</h2>
 
             </a>
         </li>
-
+        <li>
+            <a href="{{ links.mastodon }}" rel="noopener noreferrer" target="_blank">
+                <svg width="24" height="25" viewBox="0 0 216.4144 232.00976" class="c-icon" role="img"  aria-label="{{ site.footer.social_icons.mastodon }}">
+                    <path fill="currentColor" d="M211.80734 139.0875c-3.18125 16.36625-28.4925 34.2775-57.5625 37.74875-15.15875 1.80875-30.08375 3.47125-45.99875 2.74125-26.0275-1.1925-46.565-6.2125-46.565-6.2125 0 2.53375.15625 4.94625.46875 7.2025 3.38375 25.68625 25.47 27.225 46.39125 27.9425 21.11625.7225 39.91875-5.20625 39.91875-5.20625l.8675 19.09s-14.77 7.93125-41.08125 9.39c-14.50875.7975-32.52375-.365-53.50625-5.91875C9.23234 213.82 1.40609 165.31125.20859 116.09125c-.365-14.61375-.14-28.39375-.14-39.91875 0-50.33 32.97625-65.0825 32.97625-65.0825C49.67234 3.45375 78.20359.2425 107.86484 0h.72875c29.66125.2425 58.21125 3.45375 74.8375 11.09 0 0 32.975 14.7525 32.975 65.0825 0 0 .41375 37.13375-4.59875 62.915" />
+                    <path fill="var(--lighter-background-color)" d="M177.50984 80.077v60.94125h-24.14375v-59.15c0-12.46875-5.24625-18.7975-15.74-18.7975-11.6025 0-17.4175 7.5075-17.4175 22.3525v32.37625H96.20734V85.42325c0-14.845-5.81625-22.3525-17.41875-22.3525-10.49375 0-15.74 6.32875-15.74 18.7975v59.15H38.90484V80.077c0-12.455 3.17125-22.3525 9.54125-29.675 6.56875-7.3225 15.17125-11.07625 25.85-11.07625 12.355 0 21.71125 4.74875 27.8975 14.2475l6.01375 10.08125 6.015-10.08125c6.185-9.49875 15.54125-14.2475 27.8975-14.2475 10.6775 0 19.28 3.75375 25.85 11.07625 6.36875 7.3225 9.54 17.22 9.54 29.675" />
+                </svg>
+            </a>
+        </li>
     </ul>
 </nav>
diff --git a/docs/src/assets/scss/components/social-icons.scss b/docs/src/assets/scss/components/social-icons.scss
index 37902a9f588..99ac5a8dde6 100644
--- a/docs/src/assets/scss/components/social-icons.scss
+++ b/docs/src/assets/scss/components/social-icons.scss
@@ -7,7 +7,6 @@
         padding: 0;
         margin-left: -1rem;
         margin-inline-start: -1rem;
-        display: inline-flex;
 
         li {
             margin: 0;