diff --git a/content/footer/_index.md b/content/footer/_index.md
index fc494d298..c8c97df3f 100644
--- a/content/footer/_index.md
+++ b/content/footer/_index.md
@@ -5,7 +5,7 @@ insert_anchor_links: "left"
 template: "partials/footer.html"
 extra:
   logoPath: "images/new_logo_tft.png"
-  socialLinks: { Github: "https://github.com/threefoldfoundation", Github2: "https://github.com/threefoldtech", Twitter: "https://twitter.com/threefold_io", Telegram: "https://t.me/threefoldnews"  }
+  socialLinks: { Twitter: "https://twitter.com/threefold_io", Telegram: "https://t.me/threefoldnews", Github: "https://github.com/threefoldfoundation", Github2: "https://github.com/threefoldtech"}
 ---
 
 {% row(style="lean") %}
@@ -26,7 +26,7 @@ extra:
 
 |||
 
-##### <span class="text-gray-100">TALK TO HUMANS</span>
+##### <span class="text-gray-100">COMMUNITY</span>
 
 <br>
 
diff --git a/content/header/index.md b/content/header/index.md
index 55845e027..13be5080c 100644
--- a/content/header/index.md
+++ b/content/header/index.md
@@ -45,9 +45,9 @@ extra:
 
 |||
 
-<button class="dropdown" onclick="openInNewTab('https&#58;//manual.grid.tf/')">
+<button class="dropdown" onclick="openInNewTab('https&#58;//https://docs.threefold.io/')">
 
-[Documentation](https://manual.grid.tf)
+[Documentation](https://docs.threefold.io/)
 <br>
 <p class="text-sm">Explore the Documentation</p>
 
diff --git a/templates/partials/icons/twitterx.html b/templates/partials/icons/twitterx.html
new file mode 100644
index 000000000..cd59bf4a4
--- /dev/null
+++ b/templates/partials/icons/twitterx.html
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" aria-hidden="true" fill="currentColor" class="mt-2 h-8 w-8 bi bi-twitter-x" viewBox="0 0 24 24">
+  <path d="M12.6.75h2.454l-5.36 6.142L16 15.25h-4.937l-3.867-5.07-4.425 5.07H.316l5.733-6.57L0 .75h5.063l3.495 4.633L12.601.75Zm-.86 13.028h1.36L4.323 2.145H2.865z"/>
+</svg>
\ No newline at end of file
diff --git a/templates/partials/socialLinks.html b/templates/partials/socialLinks.html
index 076ebc052..239bfe733 100644
--- a/templates/partials/socialLinks.html
+++ b/templates/partials/socialLinks.html
@@ -18,7 +18,7 @@
         {% elif key == "LinkedIn" %}
         {% include "partials/icons/svgLinkedInIcon.html" %}
         {% elif key == "Twitter" %}
-        {% include "partials/icons/svgTwitterIcon.html" %}
+        {% include "partials/icons/twitterx.html" %}
         {% elif key == "Dribbble" %}
         {% include "partials/icons/svgDribbbleIcon.html" %}
         {% elif key == "Telegram" %}