diff --git a/src/content/teams/07_marketing.mdx b/src/content/teams/07_marketing.mdx
index 59892bc924..0e17af3482 100644
--- a/src/content/teams/07_marketing.mdx
+++ b/src/content/teams/07_marketing.mdx
@@ -4,6 +4,7 @@ description: Maintains this website, responsible for social media outreach, coll
 members:
 - name: Rok Garbas
   discourse: garbas
+  github: garbas
   title: Leader
 - name: Thomas Bereknyei
   discourse: tomberek
@@ -16,9 +17,11 @@ members:
   title:
 - name: Dan Baker
   discourse: djacu
+  github: djacu
   title:
 - name: Thilo Billerbeck
   discourse: avocadoom
+  github: thilobillerbeck
   title:
 contact:
 - name: Discourse
diff --git a/src/pages/community/teams/[...slug].astro b/src/pages/community/teams/[...slug].astro
index 59e800489c..7b8d95f99c 100644
--- a/src/pages/community/teams/[...slug].astro
+++ b/src/pages/community/teams/[...slug].astro
@@ -5,6 +5,7 @@ import Layout from "../../../layouts/Layout.astro";
 import PageHeader from "../../../components/layout/PageHeader.astro";
 import Container from "../../../components/layout/Container.astro";
 import Tag from "../../../components/ui/Tag.astro";
+import { Icon } from "astro-icon/components";
 
 export async function getStaticPaths() {
   const teamEntries = await getCollection("teams");
@@ -30,20 +31,36 @@ const { Content } = await entry.render();
           entry.data.members.map((member) => (
             <li class="mb-1 last:mb-0">
               {member.name}
-              {member.discourse && (
+              {member.title && (
                 <>
-                (<a href={"https://discourse.nixos.org/u/" + member.discourse}>@{member.discourse}</a>)
+                &mdash;
+                {member.title}
                 </>
               )}
-              {member.github && (
+              {member.discourse && (
+                <br />
                 <>
-                (<a href={"https://github.com/" + member.github}>@{member.github}</a>)
+                  <a href={"https://discourse.nixos.org/u/" + member.discourse}>
+                    <Icon
+                      name="simple-icons:discourse"
+                      alt="logo of discourse"
+                      class="inline-block"
+                    />
+                    @{member.discourse}
+                  </a>
                 </>
               )}
-              {member.title && (
+              {member.github && (
+                <br />
                 <>
-                &mdash;
-                {member.title}
+                  <a href={"https://github.com/" + member.github}>
+                    <Icon
+                      name="simple-icons:github"
+                      alt="logo of github"
+                      class="inline-block"
+                    />
+                    @{member.github}
+                  </a>
                 </>
               )}
             </li>