diff --git a/landing-page/components/Header.tsx b/landing-page/components/Header.tsx
index 46069d6f..3c44ec00 100644
--- a/landing-page/components/Header.tsx
+++ b/landing-page/components/Header.tsx
@@ -12,7 +12,7 @@ import { Chip } from '@helpwave/common/components/ChipList'
 
 const homeURL = '/'
 
-const linkNames = ['products', 'story', 'team', 'talks', 'tasks'] as const
+const linkNames = ['products', 'mediquu', 'story', 'team', 'talks', 'tasks'] as const
 type LinkNames = typeof linkNames[number]
 
 type LinkType = {
@@ -35,6 +35,10 @@ const items: SubLinkType[] = [
       }
     ]
   },
+  {
+    name: 'mediquu',
+    url: '/mediquu'
+  },
   {
     name: 'story',
     url: '/story'
@@ -56,6 +60,7 @@ type HeaderTranslation = {
 const defaultHeaderTranslation: Record<Languages, HeaderTranslation> = {
   en: {
     products: 'Products',
+    mediquu: 'mediQuu',
     story: 'Story',
     team: 'Team',
     contact: 'Contact us',
@@ -64,6 +69,7 @@ const defaultHeaderTranslation: Record<Languages, HeaderTranslation> = {
   },
   de: {
     products: 'Produkte',
+    mediquu: 'mediQuu',
     story: 'Geschichte',
     team: 'Team',
     contact: 'Kontakt',
@@ -80,11 +86,11 @@ const Header = () => {
 
   return (
     <>
-      <div className={tw('w-screen z-[50] fixed shadow-sm top-0 border bg-white')}>
-        <nav className={tw('flex mobile:p-2 desktop:max-w-[1000px] items-center justify-between mx-auto')}>
-          <Link href={homeURL}>
-            <Helpwave/>
-            <MarkdownInterpreter text={'\\helpwave'}/>
+      <div className={tw('absolute flex flex-row justify-center top-0 w-screen z-[50] bg-white mobile:px-6 tablet:px-12 desktop:px-24')}>
+        <nav className={tw('flex pt-2 items-center justify-between w-full max-w-[1200px]')}>
+          <Link href={homeURL} className={tw('flex flex-row gap-x-1 items-center text-2xl')}>
+            <Helpwave />
+            <MarkdownInterpreter text={'\\helpwave'} />
           </Link>
           <div className={tw('mobile:hidden w-full')}>
             <div className={tw('flex flex-wrap items-center justify-evenly')}>
@@ -141,8 +147,8 @@ const Header = () => {
             </div>
           </div>
           <button onClick={() => setNavbarOpen(true)} className={tw('desktop:hidden tablet:hidden content-end')}
-                  aria-controls="navbar" aria-expanded="false">
-            <MenuIcon size={32}/>
+            aria-controls="navbar" aria-expanded="false">
+            <MenuIcon size={32} />
           </button>
         </nav>
       </div>
@@ -151,7 +157,7 @@ const Header = () => {
         <div className={tw('absolute w-screen h-screen z-[100] bg-white')}>
           <div className={tw('text-center content-center fixed left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2')}>
             <button onClick={() => setNavbarOpen(false)} className={tw('mb-5')}>
-              <X size={64}/>
+              <X size={64} />
             </button>
 
             <div className={tw('w-full p-2')}>
diff --git a/landing-page/components/TeamMember.tsx b/landing-page/components/TeamMember.tsx
index cbaeb23a..c08defd4 100644
--- a/landing-page/components/TeamMember.tsx
+++ b/landing-page/components/TeamMember.tsx
@@ -4,7 +4,8 @@ import Link from 'next/link'
 
 export type TeamMemberProps = {
   name: string,
-  title: string | undefined,
+  prefix: string | undefined,
+  suffix: string | undefined,
   pictureURL: string | undefined,
   role: string,
   tags: string[],
@@ -13,7 +14,8 @@ export type TeamMemberProps = {
 
 const TeamMember = ({
   name,
-  title,
+  prefix,
+  suffix,
   pictureURL,
   role,
   tags,
@@ -38,8 +40,9 @@ const TeamMember = ({
   return (
     <div className={tw('flex flex-col h-full mb-8 w-1/2 text-center p-8 min-w-[300px] items-center')}>
       <Image alt="Profilepicture" src={backedPictureURL} style={{ objectFit: 'contain' }} width={size} height={size} className={tx(`w-[${size}px] tansition-all duration-500 shadow-md hover:shadow-2xl rounded-full object-center m-auto mb-6`)}/>
-      <h4 className={tw('font-space text-gray-600 text-lg h-[32px]')}>{title}</h4>
+      <h4 className={tw('font-space text-gray-600 text-lg h-[32px]')}>{prefix}</h4>
       <h2 className={tw('text-3xl font-inter')}>{name}</h2>
+      <h4 className={tw('font-space text-gray-600 text-sm h-[32px]')}>{suffix}</h4>
       <h3 className={tw('mt-4 text-2xl font-space')}>{role} <span className={tw('text-md text-sm font-sans')}>{shorthand}</span></h3>
       <h4 className={tw('mt-2 text-lg font-space leading-none justify-center flex flex-wrap gap-2 text-gray-600 max-w-[300px]')}> {generatedSocials} {hashTags}</h4>
     </div>
diff --git a/landing-page/components/sections/landing/MarketStatsSection.tsx b/landing-page/components/sections/landing/MarketStatsSection.tsx
index 390b4cc6..c0c78eca 100644
--- a/landing-page/components/sections/landing/MarketStatsSection.tsx
+++ b/landing-page/components/sections/landing/MarketStatsSection.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from '@helpwave/common/hooks/useTranslation'
 import type { Languages } from '@helpwave/common/hooks/useLanguage'
 import { Span } from '@helpwave/common/components/Span'
 import type { PropsWithChildren } from 'react'
-import { Hospital, PieChart, UsersRound } from 'lucide-react'
+import Image from 'next/image'
 import { SectionBase } from '@/components/sections/SectionBase'
 
 type MarketStatsItemProps = PropsWithChildren<{
@@ -16,8 +16,8 @@ const MarketStatsItem = ({ children, stat, title }: MarketStatsItemProps) => {
   return (
     <div className={tw('flex flex-col items-center')}>
       {children}
-      <span className={tw('text-3xl mt-2')}>{stat}</span>
-      <h4><Span type="description" className={tw('text-xl')}>{title}</Span></h4>
+      <Span className={tw('text-3xl mobile:text-xl mt-2 mobile:font-semibold')}>{stat}</Span>
+      <h4><Span type="description" className={tw('text-xl mobile:!text-base')}>{title}</Span></h4>
     </div>
   )
 }
@@ -55,15 +55,18 @@ const MarketStatsSection = ({ overwriteTranslation }: PropsForTranslation<Market
       <Span type="description" className={tw('text-center')}>{translation.marketPotential}</Span>
       <div className={tw('mt-8 w-full flex flex-wrap gap-y-16 gap-x-32 justify-evenly items-center')}>
         <MarketStatsItem stat="1.800" title={translation.hospitals}>
-          <Hospital size={72} />
+          {/* Image needs attribution to https://www.flaticon.com/free-icon/hospital_3809392?term=hospital&page=1&position=8&origin=search&related_id=3809392 */}
+          <Image width={72} height={72} alt="" src="https://cdn.helpwave.de/icons/hospital.png" className={tw('w-[72px] h-[72px] mobile:w-[48px] mobile:h-[48px] p-[5%]')}/>
         </MarketStatsItem>
 
         <MarketStatsItem stat="1.000.000" title={translation.healthcareWorkers}>
-          <UsersRound size={72} />
+          {/* Image needs attribution to https://www.flaticon.com/free-icon/hospital_3809392?term=hospital&page=1&position=8&origin=search&related_id=3809392 */}
+          <Image width={72} height={72} alt="" src="https://cdn.helpwave.de/icons/doctors.png" className={tw('w-[72px] h-[72px] mobile:w-[48px] mobile:h-[48px]')}/>
         </MarketStatsItem>
 
         <MarketStatsItem stat="12,1%" title={translation.gdp}>
-          <PieChart size={72} />
+          {/* Image needs attribution to https://www.freepik.com/icon/donut-chart_483638 */}
+          <Image width={72} height={72} alt="" src="https://cdn.helpwave.de/icons/pie_chart.png" className={tw('w-[72px] h-[72px] mobile:w-[48px] mobile:h-[48px]')}/>
         </MarketStatsItem>
       </div>
     </SectionBase>
diff --git a/landing-page/components/sections/mediQuu/MediQuuFAQ.tsx b/landing-page/components/sections/mediQuu/MediQuuFAQ.tsx
index 7c69f1a4..0a78d7e7 100644
--- a/landing-page/components/sections/mediQuu/MediQuuFAQ.tsx
+++ b/landing-page/components/sections/mediQuu/MediQuuFAQ.tsx
@@ -20,9 +20,12 @@ const defaultMediQuuFAQTranslation: Record<Languages, MediQuuFAQTranslation> = {
         question: 'I just want to continue using mediQuu products, what do I need to do?',
         answer: `
           We're glad to hear that! We'll make the transition as easy as possible for you.
-          \\b{There will be no changes to your contract or data protection terms.} In the coming weeks,
-          we will personally provide you with further information on the administrative details.
-          Protecting your data and ensuring your convenience are our top priorities.
+          \\b{There will be no changes to your contract or data protection terms.} Two emails will be sent to you in the next few days or may have already arrived in your mailbox. In one email, we will ask you to agree to the transfer of the contracts to helpwave under the existing conditions. The second email will ask you to confirm that helpwave is authorised to take over the mediQuu data under the existing data processing agreement. Please check your inbox and confirm the two emails by replying to them simply and informally. Here are two suggested wordings:
+          \\b{For the transfer of contracts:}
+          "Dear Sir or Madam, I hereby agree on behalf of practice XY to the transfer of my contracts to helpwave. I also agree to the terms and conditions and the privacy policy."
+          \\b{For the transfer of data:}
+          "Dear Sir or Madam, I hereby declare on behalf of practice XY my consent to the transfer of my personal data from mediQuu to helpwave within the scope of the existing data processing agreement."
+
         `
       },
       {
@@ -56,8 +59,12 @@ const defaultMediQuuFAQTranslation: Record<Languages, MediQuuFAQTranslation> = {
         answer: `
           Das freut uns! Wir machen Ihnen den Übergang so einfach wie möglich.
           \\b{An Ihrem Vertrag und Ihren Datenschutzbedingungen ändert sich überhaupt nichts.}
-          In den kommenden Wochen werden wir Ihnen persönlich weitere Informationen zu den administrativen
-          Details zukommen lassen. Der Schutz Ihrer Daten und Ihr Komfort stehen dabei an erster Stelle.
+          In den kommenden Tagen werden Ihnen zwei eMails zugesendet oder sind vielleicht sogar schon ins Postfach gekommen. In einer Mail bitten wir Sie um Ihre Zustimmung zur Übernahme der Verträge zu den bestehenden Konditionen and helpwave. In der zweiten Mail geht es um Ihre Bestätigung, dass helpwave die Daten der mediQuu im Rahmen der bestehenden Datenverarbeitungsvereinbarung übernehmen darf. Schauen Sie bitte in Ihr Postfach und bestätigen Sie die beiden Mails in dem Sie einfach und formlos darauf antworten. Hier wären zwei Formulierungsvorschläge:
+          \\b{Zur Übernahme der Verträge:}
+          "Sehr geehrte Damen und Herren, hiermit stimme Ich im Namen der Praxis XY der Übernahme meiner Verträge durch helpwave zu. Außerdem stimme ich den AGBs und der Datenschutzerklärung zu."
+          \\b{Zur Übernahme der Daten:}
+          "Sehr geehrte Damen und Herren, hiermit erkläre Ich im Namen der Praxis XY meine Einwilligung zur Übertragung meiner personenbezogenen Daten von mediQuu an helpwave im Rahmen der bereits an die mediQuu erteilten Auftragsverarbeitungsvereinbarung."
+          Sie sehen also, hier handelt es sich um rein administrative Schritte, die wir Ihnen so einfach wie möglich machen wollen. Der Schutz Ihrer Daten und Ihr Komfort sind uns wichtig.
         `
       },
       {
diff --git a/landing-page/components/sections/mediQuu/TeamSection.tsx b/landing-page/components/sections/mediQuu/TeamSection.tsx
index b3ed3945..ae155d74 100644
--- a/landing-page/components/sections/mediQuu/TeamSection.tsx
+++ b/landing-page/components/sections/mediQuu/TeamSection.tsx
@@ -14,7 +14,7 @@ const imageUrl = (key: string) => `https://cdn.helpwave.de/profile/${key}.png`
 const contactsHelpwave: (ProfileProps & { translatedInfo?: Record<Languages, string> })[] = [
   {
     name: 'Christian Porschen',
-    title: 'Dr. med.',
+    prefix: 'Dr. med.',
     role: 'Chief Medical Officer',
     roleBadge: 'CMO',
     imageUrl: imageUrl('christian_porschen'),
@@ -78,7 +78,6 @@ const contactsMediquu: (ProfileProps & { translatedInfo?: Record<Languages, stri
     imageUrl: 'https://cdn.helpwave.de/mediquu/christian_remfert.jpg',
     socials: [
       { type: 'linkedin', url: 'https://www.linkedin.com/in/christian-remfert/' },
-      { type: 'mail', url: 'mailto:remfert@mediquu.de' },
     ],
     imageClassName: '!w-[230px] !h-[200px]',
     translatedInfo: {
diff --git a/landing-page/components/sections/tasks/PatientSection.tsx b/landing-page/components/sections/tasks/PatientSection.tsx
index 55a9fb81..cbed93a6 100644
--- a/landing-page/components/sections/tasks/PatientSection.tsx
+++ b/landing-page/components/sections/tasks/PatientSection.tsx
@@ -5,7 +5,7 @@ import type { Languages } from '@helpwave/common/hooks/useLanguage'
 import Image from 'next/image'
 import { Span } from '@helpwave/common/components/Span'
 import { MarkdownInterpreter } from '@helpwave/common/components/MarkdownInterpreter'
-import { Tag } from 'lucide-react'
+import { TagIcon } from '@helpwave/common/icons/Tag'
 import { SectionBase } from '@/components/sections/SectionBase'
 
 type PatientSectionTranslation = {
@@ -49,8 +49,8 @@ export const PatientSection = ({ overwriteTranslation }: PropsForTranslation<Pat
       </div>
       <div className={tw('flex flex-col gap-y-2 pb-16 mobile:pb-0')}>
         <div className={tw('flex flex-col gap-y-2')}>
-          <div className={tw('flex flex-row gap-x-1 text-hw-primary-400')}>
-            <Tag size={24} strokeWidth={3}/>
+          <div className={tw('flex flex-row gap-x-1 text-hw-primary-800 items-center')}>
+            <TagIcon/>
             <Span className={tw('text-lg font-bold')}>{translation.patients}</Span>
           </div>
           <h1><Span type="title" className={tw('!text-4xl')}>{translation.title}</Span></h1>
diff --git a/landing-page/components/sections/tasks/PropertiesSection.tsx b/landing-page/components/sections/tasks/PropertiesSection.tsx
index 2417bb44..cf9621c7 100644
--- a/landing-page/components/sections/tasks/PropertiesSection.tsx
+++ b/landing-page/components/sections/tasks/PropertiesSection.tsx
@@ -5,7 +5,7 @@ import type { Languages } from '@helpwave/common/hooks/useLanguage'
 import Image from 'next/image'
 import { Span } from '@helpwave/common/components/Span'
 import { MarkdownInterpreter } from '@helpwave/common/components/MarkdownInterpreter'
-import { Tag } from 'lucide-react'
+import { TagIcon } from '@helpwave/common/icons/Tag'
 import { SectionBase } from '@/components/sections/SectionBase'
 
 type PropertiesSectionTranslation = {
@@ -49,8 +49,8 @@ export const PropertiesSection = ({ overwriteTranslation }: PropsForTranslation<
       </div>
       <div className={tw('flex flex-col gap-y-2 pb-16 mobile:pb-0')}>
         <div className={tw('flex flex-col gap-y-2')}>
-          <div className={tw('flex flex-row gap-x-1 text-hw-primary-400')}>
-            <Tag size={24} strokeWidth={3}/>
+          <div className={tw('flex flex-row gap-x-1 text-hw-primary-800 items-center')}>
+            <TagIcon/>
             <Span className={tw('text-lg font-bold')}>{translation.properties}</Span>
           </div>
           <h1><Span type="title" className={tw('!text-4xl')}>{translation.title}</Span></h1>
diff --git a/landing-page/components/sections/tasks/TasksKanbanSection.tsx b/landing-page/components/sections/tasks/TasksKanbanSection.tsx
index aa22a45d..36b47827 100644
--- a/landing-page/components/sections/tasks/TasksKanbanSection.tsx
+++ b/landing-page/components/sections/tasks/TasksKanbanSection.tsx
@@ -5,7 +5,7 @@ import type { Languages } from '@helpwave/common/hooks/useLanguage'
 import Image from 'next/image'
 import { Span } from '@helpwave/common/components/Span'
 import { MarkdownInterpreter } from '@helpwave/common/components/MarkdownInterpreter'
-import { Tag } from 'lucide-react'
+import { TagIcon } from '@helpwave/common/icons/Tag'
 import { SectionBase } from '@/components/sections/SectionBase'
 
 type TasksKanbanSectionTranslation = {
@@ -38,8 +38,8 @@ export const TasksKanbanSection = ({ overwriteTranslation }: PropsForTranslation
     >
       <div className={tw('flex flex-col gap-y-2 pb-16 mobile:pb-0')}>
         <div className={tw('flex flex-col gap-y-2')}>
-          <div className={tw('flex flex-row gap-x-1 text-hw-primary-400')}>
-            <Tag size={24} strokeWidth={3}/>
+          <div className={tw('flex flex-row gap-x-1 text-hw-primary-800 items-center')}>
+            <TagIcon/>
             <Span className={tw('text-lg font-bold')}>{translation.tasks}</Span>
           </div>
           <h1><Span type="title" className={tw('!text-4xl')}>{translation.title}</Span></h1>
diff --git a/landing-page/components/sections/tasks/TasksTemplatesSection.tsx b/landing-page/components/sections/tasks/TasksTemplatesSection.tsx
index 5fc9a554..d5fc739f 100644
--- a/landing-page/components/sections/tasks/TasksTemplatesSection.tsx
+++ b/landing-page/components/sections/tasks/TasksTemplatesSection.tsx
@@ -5,7 +5,7 @@ import type { Languages } from '@helpwave/common/hooks/useLanguage'
 import Image from 'next/image'
 import { Span } from '@helpwave/common/components/Span'
 import { MarkdownInterpreter } from '@helpwave/common/components/MarkdownInterpreter'
-import { Tag } from 'lucide-react'
+import { TagIcon } from '@helpwave/common/icons/Tag'
 import { SectionBase } from '@/components/sections/SectionBase'
 
 type TasksTemplatesSectionTranslation = {
@@ -39,8 +39,8 @@ export const TasksTemplatesSection = ({ overwriteTranslation }: PropsForTranslat
     >
       <div className={tw('flex flex-col gap-y-2 pb-16 mobile:pb-0 overflow-hidden break-words')}>
         <div className={tw('flex flex-col gap-y-2')}>
-          <div className={tw('flex flex-row gap-x-1 text-hw-primary-400')}>
-            <Tag size={24} strokeWidth={3}/>
+          <div className={tw('flex flex-row gap-x-1 text-hw-primary-800 items-center')}>
+            <TagIcon/>
             <Span className={tw('text-lg font-bold')}>{translation.taskTemplates}</Span>
           </div>
           <h1><Span type="title" className={tw('!text-4xl')}>{translation.title}</Span></h1>
diff --git a/landing-page/components/sections/team/TeamSection.tsx b/landing-page/components/sections/team/TeamSection.tsx
index f9afb152..5a9a9c7f 100644
--- a/landing-page/components/sections/team/TeamSection.tsx
+++ b/landing-page/components/sections/team/TeamSection.tsx
@@ -35,7 +35,7 @@ const teamData: Record<string, ProfileProps[]> = {
     },
     {
       name: 'Christian Porschen',
-      title: 'Dr. med.',
+      prefix: 'Dr. med.',
       role: 'Chief Medical Officer',
       roleBadge: 'CMO',
       imageUrl: imageUrl('christian_porschen'),
@@ -51,6 +51,7 @@ const teamData: Record<string, ProfileProps[]> = {
   development: [
     {
       name: 'Felix Thape',
+      suffix: 'B. Sc. RWTH',
       role: 'fullstack wizard',
       imageUrl: imageUrl('felix_thape'),
       tags: ['maintainer', 'web', 'mobile'],
@@ -62,6 +63,7 @@ const teamData: Record<string, ProfileProps[]> = {
     },
     {
       name: 'Max Baumann',
+      suffix: 'B. Sc. RWTH',
       role: 'backend magician',
       imageUrl: imageUrl('max_baumann'),
       tags: ['microservices', 'deployment', 'database'],
@@ -115,6 +117,8 @@ const teamData: Record<string, ProfileProps[]> = {
   medical: [
     {
       name: 'Ludwig Maidowski',
+      prefix: 'Dipl.-Jur.',
+      suffix: 'Maître en droit, Paris II',
       role: 'medical professional & legal',
       tags: ['law', 'doctor', 'product'],
       imageUrl: imageUrl('ludwig_maidowski'),
diff --git a/landing-page/pages/credits/index.tsx b/landing-page/pages/credits/index.tsx
index 350b46c5..be830d89 100644
--- a/landing-page/pages/credits/index.tsx
+++ b/landing-page/pages/credits/index.tsx
@@ -12,17 +12,23 @@ import { Page } from '@/components/Page'
 
 type CreditsPageTranslation = {
   title: string,
-  text: string
+  text: string,
+  flaticon: string,
+  createdBy: (name: string, author: string) => string
 }
 
 const defaultCreditsPageTranslation: Record<Languages, CreditsPageTranslation> = {
   en: {
     title: 'Credits',
-    text: 'To credit our use of stock-footage from other websites, we are pleased to list them on this page.'
+    text: 'To credit our use of stock-footage from other websites, we are pleased to list them on this page.',
+    flaticon: 'Icons by Flaticon',
+    createdBy: (name, author) => `${name} created by ${author}`
   },
   de: {
     title: 'Credits',
-    text: 'Um die Verwendung von Stock-Footage von anderen Websites zu würdigen, führen wir sie gerne auf dieser Seite auf.'
+    text: 'Um die Verwendung von Stock-Footage von anderen Websites zu würdigen, führen wir sie gerne auf dieser Seite auf.',
+    flaticon: 'Icons von Flaticon',
+    createdBy: (name, author) => `${name} erstellt von ${author}`
   }
 }
 
@@ -46,9 +52,31 @@ const freepikCredits: { text: string, link: string }[] = [
   {
     text: 'Image by freepik on Freepik',
     link: 'https://www.freepik.com/free-vector/infographic-dashboard-element-set_6209714.htm'
+  },
+  {
+    text: 'Image by Those Icons on Freepik',
+    link: 'https://www.freepik.com/icon/donut-chart_483638'
   }
 ]
 
+const flaticonCredits: { author: string, link: string, name: string }[] = [
+  {
+    name: 'label',
+    author: 'Creatype',
+    link: 'https://www.flaticon.com/free-icon/price-tag_721550?term=label&page=1&position=8&origin=tag&related_id=721550'
+  },
+  {
+    name: 'hospital',
+    author: 'Freepik',
+    link: 'https://www.flaticon.com/free-icon/hospital_3809392?term=hospital&page=1&position=8&origin=search&related_id=3809392'
+  },
+  {
+    name: 'doctors',
+    author: 'Slidicon',
+    link: 'https://www.flaticon.com/free-icon/doctors_3017241?term=doctors&page=1&position=14&origin=search&related_id=3017241'
+  },
+]
+
 const CreditsPage: NextPage = ({ overwriteTranslation }: PropsForTranslation<CreditsPageTranslation>) => {
   const translation = useTranslation(defaultCreditsPageTranslation, overwriteTranslation)
   const imageUrl = 'https://cdn.helpwave.de/landing_page/credits.jpg'
@@ -80,16 +108,26 @@ const CreditsPage: NextPage = ({ overwriteTranslation }: PropsForTranslation<Cre
 
       <SectionBase backgroundColor="gray" className={tw('w-full')}>
         <h2><Span type="subsectionTitle">Freepik</Span></h2>
-        <div className={tw('flex grow flex-col items-center min-w-50 items-center')}>
+        <div className={tw('flex grow flex-col items-center min-w-50 items-center gap-y-4')}>
           {
             freepikCredits.map((credit) => (
-              <div className={tw('mt-5 w-full')} key={credit.link}>
+              <div className={tw('w-full')} key={credit.link}>
                 <Span type="normal">{credit.text}</Span>
                 <Link href={credit.link} className={tw('underline block')} target="_blank">{credit.link}</Link>
               </div>
             ))
           }
         </div>
+
+      </SectionBase>
+
+      <SectionBase backgroundColor="white" className={tw('flex flex-col gap-y-2 w-full')}>
+        <h2><Span type="title">{translation.flaticon}</Span></h2>
+        {flaticonCredits.map(({ name, author, link }) => (
+          <Link key={name + author} href={link} title={name} className={tw('underline')} target="_blank">
+            {translation.createdBy(name, author)}
+          </Link>
+        ))}
       </SectionBase>
     </Page>
   )
diff --git a/lib/components/Profile.tsx b/lib/components/Profile.tsx
index de71d1b0..b089c51e 100644
--- a/lib/components/Profile.tsx
+++ b/lib/components/Profile.tsx
@@ -53,7 +53,8 @@ export type ProfileProps = HTMLAttributes<HTMLDivElement> & {
   name: string,
   imageUrl: string,
   badge?: ReactNode,
-  title?: string,
+  prefix?: string,
+  suffix?: string,
   roleBadge?: string,
   role?: string,
   /**
@@ -72,7 +73,8 @@ export const Profile = ({
   name,
   imageUrl,
   badge,
-  title,
+  prefix,
+  suffix,
   roleBadge,
   role,
   tags,
@@ -98,8 +100,9 @@ export const Profile = ({
           </div>
         )}
       </div>
-      {title && <Span className={tw('font-semibold')}>{title}</Span>}
+      {prefix && <Span className={tw('font-semibold')}>{prefix}</Span>}
       <h2 id={name}><Span type="title">{name}</Span></h2>
+      {suffix && <Span className={tw('text-sm mb-1')}>{suffix}</Span>}
       {role && <Span className={tw('font-space font-bold text-sm')}>{role}</Span>}
       {tags && (
         <div className={tw('flex flex-wrap mx-4 mt-2 gap-x-2 justify-center')}>
diff --git a/lib/icons/Tag.tsx b/lib/icons/Tag.tsx
new file mode 100644
index 00000000..9a6193fc
--- /dev/null
+++ b/lib/icons/Tag.tsx
@@ -0,0 +1,30 @@
+import type { ImageProps } from 'next/image'
+import Image from 'next/image'
+import { tx } from '@twind/core'
+
+export type TagProps = Omit<ImageProps, 'src'|'alt'>
+
+/**
+ * Tag icon from flaticon
+ *
+ * https://www.flaticon.com/free-icon/price-tag_721550?term=label&page=1&position=8&origin=tag&related_id=721550
+ *
+ * When using it make attribution
+ */
+export const TagIcon = ({
+  className,
+  width = 16,
+  height = 16,
+  ...props
+}: TagProps) => {
+  return (
+    <Image
+      {...props}
+      width={width}
+      height={height}
+      alt=""
+      src="https://cdn.helpwave.de/icons/label.png"
+      className={tx(`w-[${width}px] h-[${height}px]`, className)}
+    />
+  )
+}