diff --git a/data/social_media/links/navbar.json b/data/social_media/links/navbar.json
new file mode 100644
index 0000000..68f8c07
--- /dev/null
+++ b/data/social_media/links/navbar.json
@@ -0,0 +1,5 @@
+[
+    {"name": "Hellug @ Mastodon", "url": "https://mastodon.social/@hellug/", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M433 179.1c0-97.2-63.7-125.7-63.7-125.7-62.5-28.7-228.6-28.4-290.5 0 0 0-63.7 28.5-63.7 125.7 0 115.7-6.6 259.4 105.6 289.1 40.5 10.7 75.3 13 103.3 11.4 50.8-2.8 79.3-18.1 79.3-18.1l-1.7-36.9s-36.3 11.4-77.1 10.1c-40.4-1.4-83-4.4-89.6-54a102.5 102.5 0 0 1 -.9-13.9c85.6 20.9 158.7 9.1 178.8 6.7 56.1-6.7 105-41.3 111.2-72.9 9.8-49.8 9-121.5 9-121.5zm-75.1 125.2h-46.6v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.3V197c0-58.5-64-56.6-64-6.9v114.2H90.2c0-122.1-5.2-147.9 18.4-175 25.9-28.9 79.8-30.8 103.8 6.1l11.6 19.5 11.6-19.5c24.1-37.1 78.1-34.8 103.8-6.1 23.7 27.3 18.4 53 18.4 175z\"\/><title>Hellug @ Mastodon<\/title><\/svg>"},
+    {"name": "Hellug @ Git", "url": "https://dev.hellug.gr/hellug", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M439.6 236.1L244 40.5a28.9 28.9 0 0 0 -40.8 0l-40.7 40.6 51.5 51.5c27.1-9.1 52.7 16.8 43.4 43.7l49.7 49.7c34.2-11.8 61.2 31 35.5 56.7-26.5 26.5-70.2-2.9-56-37.3L240.2 199v121.9c25.3 12.5 22.3 41.9 9.1 55a34.3 34.3 0 0 1 -48.6 0c-17.6-17.6-11.1-46.9 11.3-56v-123c-20.8-8.5-24.6-30.7-18.6-45L142.6 101 8.5 235.1a28.9 28.9 0 0 0 0 40.8l195.6 195.6a28.9 28.9 0 0 0 40.8 0l194.7-194.7a28.9 28.9 0 0 0 0-40.8z\"\/><title>Hellug Git<\/title><\/svg>"},
+    {"name": "Ροή RSS", "url": "https://www.hellug.gr/index.xml", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M0 64C0 46.3 14.3 32 32 32c229.8 0 416 186.2 416 416c0 17.7-14.3 32-32 32s-32-14.3-32-32C384 253.6 226.4 96 32 96C14.3 96 0 81.7 0 64zM0 416a64 64 0 1 1 128 0A64 64 0 1 1 0 416zM32 160c159.1 0 288 128.9 288 288c0 17.7-14.3 32-32 32s-32-14.3-32-32c0-123.7-100.3-224-224-224c-17.7 0-32-14.3-32-32s14.3-32 32-32z\"\/><title>Ροή RSS<\/title><\/svg>"}
+]
diff --git a/data/social_media/links/sidebar.json b/data/social_media/links/sidebar.json
new file mode 100644
index 0000000..df250e6
--- /dev/null
+++ b/data/social_media/links/sidebar.json
@@ -0,0 +1,8 @@
+[
+    {"name": "Hellug @ Mastodon", "url": "https://mastodon.social/@hellug/", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M433 179.1c0-97.2-63.7-125.7-63.7-125.7-62.5-28.7-228.6-28.4-290.5 0 0 0-63.7 28.5-63.7 125.7 0 115.7-6.6 259.4 105.6 289.1 40.5 10.7 75.3 13 103.3 11.4 50.8-2.8 79.3-18.1 79.3-18.1l-1.7-36.9s-36.3 11.4-77.1 10.1c-40.4-1.4-83-4.4-89.6-54a102.5 102.5 0 0 1 -.9-13.9c85.6 20.9 158.7 9.1 178.8 6.7 56.1-6.7 105-41.3 111.2-72.9 9.8-49.8 9-121.5 9-121.5zm-75.1 125.2h-46.6v-114.2c0-49.7-64-51.6-64 6.9v62.5h-46.3V197c0-58.5-64-56.6-64-6.9v114.2H90.2c0-122.1-5.2-147.9 18.4-175 25.9-28.9 79.8-30.8 103.8 6.1l11.6 19.5 11.6-19.5c24.1-37.1 78.1-34.8 103.8-6.1 23.7 27.3 18.4 53 18.4 175z\"\/><title>Hellug @ Mastodon<\/title><\/svg>"},
+    {"name": "Hellug @ Twitter/X", "url": "https://twitter.com/hellug", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z\"\/><title>Hellug @ Twitter\/X<\/title><\/svg>"},
+    {"name": "Hellug @ Facebook", "url": "https://www.facebook.com/groups/hellug/", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\"  class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M512 256C512 114.6 397.4 0 256 0S0 114.6 0 256C0 376 82.7 476.8 194.2 504.5V334.2H141.4V256h52.8V222.3c0-87.1 39.4-127.5 125-127.5c16.2 0 44.2 3.2 55.7 6.4V172c-6-.6-16.5-1-29.6-1c-42 0-58.2 15.9-58.2 57.2V256h83.6l-14.4 78.2H287V510.1C413.8 494.8 512 386.9 512 256h0z\"\/><title>Hellug @ Facebook<\/title><\/svg>"},
+    {"name": "Hellug @ LinkedIn", "url": "http://www.linkedin.com/groups/HELLUG-108292/about", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M100.3 448H7.4V148.9h92.9zM53.8 108.1C24.1 108.1 0 83.5 0 53.8a53.8 53.8 0 0 1 107.6 0c0 29.7-24.1 54.3-53.8 54.3zM447.9 448h-92.7V302.4c0-34.7-.7-79.2-48.3-79.2-48.3 0-55.7 37.7-55.7 76.7V448h-92.8V148.9h89.1v40.8h1.3c12.4-23.5 42.7-48.3 87.9-48.3 94 0 111.3 61.9 111.3 142.3V448z\"\/><title>Hellug @ LinkenIn<\/title><\/svg>"},
+    {"name": "Hellug @ Git", "url": "https://dev.hellug.gr/hellug", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M439.6 236.1L244 40.5a28.9 28.9 0 0 0 -40.8 0l-40.7 40.6 51.5 51.5c27.1-9.1 52.7 16.8 43.4 43.7l49.7 49.7c34.2-11.8 61.2 31 35.5 56.7-26.5 26.5-70.2-2.9-56-37.3L240.2 199v121.9c25.3 12.5 22.3 41.9 9.1 55a34.3 34.3 0 0 1 -48.6 0c-17.6-17.6-11.1-46.9 11.3-56v-123c-20.8-8.5-24.6-30.7-18.6-45L142.6 101 8.5 235.1a28.9 28.9 0 0 0 0 40.8l195.6 195.6a28.9 28.9 0 0 0 40.8 0l194.7-194.7a28.9 28.9 0 0 0 0-40.8z\"\/><title>Hellug Git<\/title><\/svg>"},
+    {"name": "Ροή RSS", "url": "https://www.hellug.gr/index.xml", "svg": "<svg xmlns=\"http:\/\/www.w3.org\/2000\/svg\" class=\"icon\" width=\"24\" height=\"24\" viewBox=\"0 0 512 512\"><path fill=\"currentColor\" d=\"M0 64C0 46.3 14.3 32 32 32c229.8 0 416 186.2 416 416c0 17.7-14.3 32-32 32s-32-14.3-32-32C384 253.6 226.4 96 32 96C14.3 96 0 81.7 0 64zM0 416a64 64 0 1 1 128 0A64 64 0 1 1 0 416zM32 160c159.1 0 288 128.9 288 288c0 17.7-14.3 32-32 32s-32-14.3-32-32c0-123.7-100.3-224-224-224c-17.7 0-32-14.3-32-32s14.3-32 32-32z\"\/><title>Ροή RSS<\/title><\/svg>"}
+]
diff --git a/themes/hellug-bootstrap/layouts/partials/column2.html b/themes/hellug-bootstrap/layouts/partials/column2.html
index 98c7608..1c4c361 100644
--- a/themes/hellug-bootstrap/layouts/partials/column2.html
+++ b/themes/hellug-bootstrap/layouts/partials/column2.html
@@ -63,12 +63,12 @@
             </div>
             <div class="card-body" align="left">
                 <div class="btn-group flex-wrap">
-                    <a rel="me" href="https://mastodon.social/@hellug/"><button type="button" class="btn btn-default" style="padding-top:1px; padding-bottom:1px;margin-bottom:4px;"><img alt="" src="/media/Mastodon.png">Mastodon</button></a>
-                    <a href="https://twitter.com/hellug"><button type="button" class="btn btn-default" style="padding-top:1px; padding-bottom:1px; margin-bottom:4px;"><img alt="" src="/media/Twitter.png">Twitter</button></a>
-                    <a href="http://www.linkedin.com/groups/HELLUG-108292/about"><button type="button" class="btn btn-default" style="padding-top:1px; padding-bottom:1px; margin-bottom:4px;"><img alt="" src="/media/LinkedIn.png">LinkedIn</button></a>
-                    <a href="https://www.facebook.com/groups/hellug/"><button type="button" class="btn btn-default" style="padding-top:1px; padding-bottom:1px;margin-bottom:4px;"><img alt="" src="/media/Facebook.png">Facebook</button></a>
-                    <a href="https://www.hellug.gr/index.xml"><button type="button" class="btn btn-default" style="padding-top:1px; padding-bottom:1px; margin-bottom:4px;"><svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="currentColor" class="bi bi-rss" viewBox="0 0 16 16"><path d="M14 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1zM2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2z"/><path d="M5.5 12a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0m-3-8.5a1 1 0 0 1 1-1c5.523 0 10 4.477 10 10a1 1 0 1 1-2 0 8 8 0 0 0-8-8 1 1 0 0 1-1-1m0 4a1 1 0 0 1 1-1 6 6 0 0 1 6 6 1 1 0 1 1-2 0 4 4 0 0 0-4-4 1 1 0 0 1-1-1"/></svg>RSS</button></a>
-                </div>
+		<ul class="list-inline">
+                {{- range .Site.Data.social_media.links.sidebar }}
+                <li class="list-inline-item"><a class="nav-link" href="{{ .url }}">{{ .svg | safeHTML }}</a></li>
+            {{- end }}
+            </ul>
+            </div>
             </div>
         </div>
     </div>
diff --git a/themes/hellug-bootstrap/layouts/partials/header.html b/themes/hellug-bootstrap/layouts/partials/header.html
index 86e93bc..95fd79c 100644
--- a/themes/hellug-bootstrap/layouts/partials/header.html
+++ b/themes/hellug-bootstrap/layouts/partials/header.html
@@ -45,6 +45,15 @@
                     </ul>
                 </li>
             </ul>
+            <ul class="navbar-nav d-flex flex-row">
+            {{- range .Site.Data.social_media.links.navbar }}
+                <li class="nav-item me-3 me-lg-0">
+		   <a class="nav-link" href="{{ .url }}" alt="{{ .name }}">
+			   {{ .svg | safeHTML }}
+                    </a>
+                </li>
+            {{- end }}
+	    </ul>
         </div>
     </div><!-- /.navbar-collapse -->
 </nav>