diff --git a/_data/socials.yml b/_data/socials.yml
index 4794b72..5d70ea4 100644
--- a/_data/socials.yml
+++ b/_data/socials.yml
@@ -1,11 +1,19 @@
-- name: discord
+- name: Discord
   url: https://discordapp.com/invite/aRUAYFN
-  icon: discord.png
+  icon: discord.svg
 
-- name: twitter
-  url: https://twitter.com/pebble_dev/
-  icon: twitter.png
+- name: Bluesky
+  url: https://bsky.app/profile/rebble.io/
+  icon: bluesky.svg
 
-- name: email
-  url: /contact/
-  icon: email.png
+- name: Mastodon
+  url: https://mastodon.social/@rebble
+  icon: mastodon.svg
+
+- name: GitHub
+  url: https://github.com/pebble-dev
+  icon: github.svg
+
+- name: Email
+  url: mailto:support@rebble.io
+  icon: email.svg
diff --git a/_includes/footer.html b/_includes/footer.html
index d4a32ab..ea9471b 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -5,7 +5,7 @@
     </div>
     <div class="text-content">
       {% for item in site.data.socials %}
-        <a href="{{ item.url }}"><img class="footer-icon" alt="icon-{{ item.name }}" src="/images/social-icons/{{ item.icon }}"></img></a>
+        <a rel="me" href="{{ item.url }}"><img class="footer-icon" alt="{{ item.name }}" src="/images/social-icons/{{ item.icon }}"></img></a>
       {% endfor %}
     </div>
     {% include mailinglist.html %}
diff --git a/_includes/head.html b/_includes/head.html
index 9ec4834..c81d2ea 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -3,6 +3,7 @@
     <title>{% if page.title and page.title != site.title %}{{ site.title }} · {{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}"/>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/>
+    <meta name="fediverse:creator" content="@rebble@mastodon.social">
     <link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
     <link rel="icon" type="image/x-icon" href="/images/favicon.ico">
     <link rel="stylesheet" href="/css/common.css?version=1.2.0">
diff --git a/_scss/footer.scss b/_scss/footer.scss
index 453820a..46a670c 100644
--- a/_scss/footer.scss
+++ b/_scss/footer.scss
@@ -14,7 +14,7 @@ footer {
 }
 
 .footer-icon {
-	height: 30px;
-	width: 30px;
+	height: 25px;
+	width: 25px;
 	margin-left: 10px;
 }
diff --git a/images/social-icons/bluesky.svg b/images/social-icons/bluesky.svg
new file mode 100644
index 0000000..9e9a6b6
--- /dev/null
+++ b/images/social-icons/bluesky.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="m20 1-8 8-8-8-3 1v8l2 4h4l-4 2v4l3 3h4l2-4 2 4h4l3-3v-4l-4-2h4l2-4V2z" style="fill:#fff;stroke:#000;stroke-linejoin:round;stroke-width:2px"/></svg>
\ No newline at end of file
diff --git a/images/social-icons/discord.png b/images/social-icons/discord.png
deleted file mode 100644
index e003157..0000000
Binary files a/images/social-icons/discord.png and /dev/null differ
diff --git a/images/social-icons/discord.svg b/images/social-icons/discord.svg
new file mode 100644
index 0000000..6357272
--- /dev/null
+++ b/images/social-icons/discord.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" viewBox="0 0 25 25"><g stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"><path fill="#fff" d="M1 14v4l6 3 2-2h7l2 2 6-3v-4l-3-9-3-1-1 1H8L7 4 4 5z"/><path fill="none" d="M7 12h3v3H7zM15 12h3v3h-3z"/></g></svg>
\ No newline at end of file
diff --git a/images/social-icons/email.png b/images/social-icons/email.png
deleted file mode 100644
index 56f4c79..0000000
Binary files a/images/social-icons/email.png and /dev/null differ
diff --git a/images/social-icons/email.svg b/images/social-icons/email.svg
new file mode 100644
index 0000000..ee6c2d5
--- /dev/null
+++ b/images/social-icons/email.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" viewBox="0 0 25 25"><path fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M23 5H1v16h22z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="2" d="M22 5 12 15 2 5M1 21l6-6M23 21l-6-6"/></svg>
\ No newline at end of file
diff --git a/images/social-icons/facebook.png b/images/social-icons/facebook.png
deleted file mode 100644
index 3093a04..0000000
Binary files a/images/social-icons/facebook.png and /dev/null differ
diff --git a/images/social-icons/github.svg b/images/social-icons/github.svg
new file mode 100644
index 0000000..4c2102e
--- /dev/null
+++ b/images/social-icons/github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="25" height="25" fill="none" viewBox="0 0 25 25"><path fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M23 4H2v17h21z"/><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m8 11-2 2 3 2-2 2M13 17h4"/></svg>
\ No newline at end of file
diff --git a/images/social-icons/mastodon.svg b/images/social-icons/mastodon.svg
new file mode 100644
index 0000000..0b18087
--- /dev/null
+++ b/images/social-icons/mastodon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="25" height="25" viewBox="0 0 25 25"><path fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 1 1 6v12l6 6h10v-3H9l-3-3h13l4-4V5l-4-4z"/><path fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 14V8l3-3 3 3 3-3 3 3v6M12 8v4"/></svg>
\ No newline at end of file
diff --git a/images/social-icons/twitter.png b/images/social-icons/twitter.png
deleted file mode 100644
index cf21e3e..0000000
Binary files a/images/social-icons/twitter.png and /dev/null differ