diff --git a/README.adoc b/README.adoc
index 9712d517..cb9aa6a5 100644
--- a/README.adoc
+++ b/README.adoc
@@ -10,9 +10,11 @@ endif::[]
 ifndef::env-github[:source-style: source]
 
 :imagesdir: ./images/
+
+image::meta/gematik.png[logo,width=250,height=47,role=right]
+
 = TI Messenger Documentation v1.1.1
 
-image::meta/gematik_logo.svg[gematik,width="70%"]
 
 image:https://github.com/gematik/api-ti-messenger/actions/workflows/lint.yml/badge.svg[link="https://github.com/gematik/api-ti-messenger/actions/workflows/lint.yml"]
 image:https://github.com/gematik/api-ti-messenger/actions/workflows/generate-images.yml/badge.svg[link="https://github.com/gematik/api-ti-messenger/actions/workflows/generate-images.yml"]
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index a282a608..10473d90 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,5 +1,5 @@
-<img align="right" width="250" height="47" src="images/meta/gematik_logo.svg" alt="Gematik Logo"/> <br/>    
- 
+<img align="right" width="250" height="47" src="images/meta/gematik.png" alt="Gematik Logo"/>
+
 # Release Notes api-ti-messenger
 
 ## tim-pro-1.0.0
diff --git a/docs/Authenticator/authenticator.adoc b/docs/Authenticator/authenticator.adoc
index 5bdacc4e..bce00f2e 100644
--- a/docs/Authenticator/authenticator.adoc
+++ b/docs/Authenticator/authenticator.adoc
@@ -13,11 +13,10 @@ endif::[]
 :numbered:
 :sectnumlevels: 6
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
-
 = gematik Authenticator
 == Überblick
 Für die Authentifizierung mittels Smartcard stellt die gematik einen eigenen *Authenticator* zur Verfügung. Hersteller eines *TI-Messenger-Dienstes* können auch eigene Authenticator Lösungen entwickeln, um zum Beispiel an mobilen Endgeräten eine Interaktion mit Smartcards über die NFC-Schnittstelle zu realisieren. Im folgenden wird auf den *Authenticator* der gematik eingegangen.
diff --git a/docs/Client/Client.adoc b/docs/Client/Client.adoc
index b23272f7..782f674e 100644
--- a/docs/Client/Client.adoc
+++ b/docs/Client/Client.adoc
@@ -13,7 +13,7 @@ endif::[]
 :numbered:
 :sectnumlevels: 6
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
diff --git a/docs/FAQ/FAQ.adoc b/docs/FAQ/FAQ.adoc
index d0ebd46f..5465c822 100644
--- a/docs/FAQ/FAQ.adoc
+++ b/docs/FAQ/FAQ.adoc
@@ -12,7 +12,7 @@ endif::[]
 :toc-title: Table of Contents
 :numbered:
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
diff --git a/docs/Fachdienst/Fachdienst.adoc b/docs/Fachdienst/Fachdienst.adoc
index e204bae3..e83f3a73 100644
--- a/docs/Fachdienst/Fachdienst.adoc
+++ b/docs/Fachdienst/Fachdienst.adoc
@@ -12,7 +12,7 @@ endif::[]
 :toc-title: Inhaltsverzeichnis
 :numbered:
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 = TI-Messenger-Fachdienst
diff --git a/docs/Fachdienst/MessengerService.adoc b/docs/Fachdienst/MessengerService.adoc
index dd5ef495..d38e8d99 100644
--- a/docs/Fachdienst/MessengerService.adoc
+++ b/docs/Fachdienst/MessengerService.adoc
@@ -13,7 +13,7 @@ endif::[]
 :numbered:
 :sectnumlevels: 5
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
diff --git a/docs/Fachdienst/Registrierungsdienst.adoc b/docs/Fachdienst/Registrierungsdienst.adoc
index 458350f1..be672b30 100644
--- a/docs/Fachdienst/Registrierungsdienst.adoc
+++ b/docs/Fachdienst/Registrierungsdienst.adoc
@@ -12,7 +12,7 @@ endif::[]
 :toc-title: Inhaltsverzeichnis
 :numbered:
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
diff --git a/docs/Foederationsliste/Foederationsliste.adoc b/docs/Foederationsliste/Foederationsliste.adoc
index f0e81e5e..34d97a0d 100644
--- a/docs/Foederationsliste/Foederationsliste.adoc
+++ b/docs/Foederationsliste/Foederationsliste.adoc
@@ -12,7 +12,7 @@ endif::[]
 :toc-title: Table of Contents
 :numbered:
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
diff --git a/docs/IDP/idp.adoc b/docs/IDP/idp.adoc
index 3b5e185a..8cf3f2e7 100644
--- a/docs/IDP/idp.adoc
+++ b/docs/IDP/idp.adoc
@@ -13,7 +13,7 @@ endif::[]
 :numbered:
 :sectnumlevels: 6
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
diff --git a/docs/Primaersystem/Primaersystem.adoc b/docs/Primaersystem/Primaersystem.adoc
index 6829b855..d3427add 100644
--- a/docs/Primaersystem/Primaersystem.adoc
+++ b/docs/Primaersystem/Primaersystem.adoc
@@ -13,7 +13,7 @@ endif::[]
 :numbered:
 :sectnumlevels: 6
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 toc::[]
 
diff --git a/docs/Test/Test.adoc b/docs/Test/Test.adoc
index 77a9bed7..97b72b5e 100644
--- a/docs/Test/Test.adoc
+++ b/docs/Test/Test.adoc
@@ -13,7 +13,7 @@ endif::[]
 :numbered:
 :sectnumlevels: 6
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 = Testkonzept TI-Messenger-Dienst
 gematik
diff --git a/docs/anwendungsfaelle/COM-chatbot.adoc b/docs/anwendungsfaelle/COM-chatbot.adoc
index 5d3365e7..29909f3d 100644
--- a/docs/anwendungsfaelle/COM-chatbot.adoc
+++ b/docs/anwendungsfaelle/COM-chatbot.adoc
@@ -8,7 +8,7 @@ endif::[]
 
 :imagesdir: ../../images
 
-image:meta/gematik_logo.svg[width=70%]
+image::meta/gematik.png[logo,width=250,height=47,role=right]
 
 === Kommunikation mit einem Chatbot
 Im Folgenden wird ein Beispiel für eine mögliche Zuordnung für die Abbildung von Funktionsaccounts mit Hilfe von Chatbots und eines Akteurs der stellvertretend für die Organisation auftritt.
diff --git a/images/meta/Gematik_Logo_Flag.png b/images/meta/Gematik_Logo_Flag.png
deleted file mode 100644
index fc27adee..00000000
Binary files a/images/meta/Gematik_Logo_Flag.png and /dev/null differ
diff --git a/images/meta/gematik.png b/images/meta/gematik.png
new file mode 100644
index 00000000..a3c92931
Binary files /dev/null and b/images/meta/gematik.png differ
diff --git a/images/meta/gematik_logo.svg b/images/meta/gematik_logo.svg
deleted file mode 100644
index 59ee2b32..00000000
--- a/images/meta/gematik_logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 642.11 143.2"><defs><style>.cls-1{fill:none;}.cls-2{fill:#000e52;}.cls-3{fill:#e10000;}.cls-4{fill:#fc0;}</style></defs><rect id="Schutzraum" class="cls-1" width="642.11" height="143.2"/><rect class="cls-2" x="443.72" y="54.5" width="1.6" height="36.49"/><path class="cls-2" d="M402.2,68.39h-.3V37.89h-8V91h8V75.59h.2L418,90.89h10.8L409,71.59l19.6-17.1H417.9ZM373.6,91h8V54.49h-8Zm3.9-53.9a5.44,5.44,0,0,0-5.5,5.6,5.36,5.36,0,0,0,5.5,5.5,5.55,5.55,0,1,0,0-11.1M350,61.69h14v-7.2H350V43.59h-8v33.9c0,9.7,4.9,14.2,13,14.2a19.56,19.56,0,0,0,11.1-3.6l-3.1-6.4a14.56,14.56,0,0,1-7.4,2.5c-3.2,0-5.8-2-5.8-6.8l.2-15.7Zm-34.7,23.8c-6,0-8-2.4-8-4.8s1.7-4.5,7.1-5.1l10-1v9.6a27.89,27.89,0,0,1-9.1,1.3m.8-31.7A29.4,29.4,0,0,0,300.7,58l3,6.4a26,26,0,0,1,12.1-3.6c5.5,0,8.7,2.1,8.7,7v.6l-9,.9c-10,1-16.1,4.5-16.1,11.3s4.6,11.1,16.3,11.1c5.9,0,12.7-1.4,16.8-3.6V67.39c-.1-9-6.1-13.5-16.4-13.6m-39.9,0a26.51,26.51,0,0,0-13.1,3.6c-2.9-2.4-7-3.6-11.9-3.6-6.1,0-12.6,2.4-16,6V91h8l-.1-27a13.32,13.32,0,0,1,8.9-2.7c5,0,8,3,8,8.1V91h8V69.29a17.45,17.45,0,0,0-.7-5.3,15,15,0,0,1,8.7-2.8c4.8,0,8,2.5,8,8.1V91h8V69.29c-.1-10.3-6.1-15.5-15.8-15.5M200,69.09c1-5.1,4.6-8.4,10.1-8.4,5.1,0,8.3,3,9.2,8.4Zm27.5,3c0-11.1-7.1-18.4-17.2-18.4-10.7,0-18.6,7.5-18.6,18.7,0,12.1,8.2,19.3,19.1,19.3a22.16,22.16,0,0,0,14.9-5.1l-3.9-6.3a14.65,14.65,0,0,1-10.5,4.5c-5.3,0-10.8-2.7-11.4-9.8h27.5c0-.8.1-1.9.1-2.9m-45.1-12.3c-4.7-4.8-11.7-6-16.2-6-13.1,0-20.9,7.6-20.9,19,0,10.9,7.4,18.1,17.9,18.1,3,0,4.7-1.4,4.7-3.9,0-2.3-1.7-3.6-4.7-3.6-5.8,0-9.9-4.2-9.9-10.7,0-7,4.5-11.6,12.4-11.6,2.6,0,6.3.7,8.4,2.7v26.7c0,5.6-5.1,8.2-11.4,8.2a19.24,19.24,0,0,1-10.3-3c-3.1-1.5-6.1-.1-6.1,2.9,0,5,9.1,7.5,16.5,7.5,11.1,0,19.6-4.8,19.6-15.6V59.79Z" transform="translate(0 0)"/><path d="M110.5,61.53h-41a3.5,3.5,0,1,1,0-7h41a3.5,3.5,0,1,1,0,7Z" transform="translate(0 0)"/><path class="cls-3" d="M110.5,76.26H55.1a3.56,3.56,0,0,1-3.6-3.5,3.5,3.5,0,0,1,3.6-3.5h55.4a3.5,3.5,0,1,1,0,7Z" transform="translate(0 0)"/><path class="cls-4" d="M110.5,91H40.7a3.5,3.5,0,1,1,0-7h69.8a3.5,3.5,0,1,1,0,7Z" transform="translate(0 0)"/><path class="cls-2" d="M472,68.12,463.69,57.5V68.12H461.9V54.49h1.56l8.29,10.61V54.49h1.77V68.12Z" transform="translate(0 0)"/><path class="cls-2" d="M481.12,58.33A4.18,4.18,0,0,1,484.49,60V58.52h1.65v9.6h-1.65V66.64a4.21,4.21,0,0,1-3.37,1.67,5,5,0,0,1,0-10Zm.25,1.51a3.48,3.48,0,1,0,3.26,3.48A3.3,3.3,0,0,0,481.37,59.84Z" transform="translate(0 0)"/><path class="cls-2" d="M493.19,68.21a2.7,2.7,0,0,1-2.94-2.94V60h-2V58.52h2V55.85h1.65v2.67h2.76V60H491.9v5c0,1.23.56,1.63,1.59,1.63a3.46,3.46,0,0,0,1.17-.19V68A4.4,4.4,0,0,1,493.19,68.21Z" transform="translate(0 0)"/><path class="cls-2" d="M497.69,56a1.18,1.18,0,1,1,0-2.35,1.18,1.18,0,0,1,0,2.35Zm-.84,2.57h1.65v9.6h-1.65Z" transform="translate(0 0)"/><path class="cls-2" d="M506,68.31a5,5,0,1,1,5-5A4.93,4.93,0,0,1,506,68.31Zm0-1.54a3.46,3.46,0,1,0-3.34-3.45A3.28,3.28,0,0,0,506,66.77Z" transform="translate(0 0)"/><path class="cls-2" d="M513.65,58.52h1.65V60a3.37,3.37,0,0,1,3.05-1.67A3.53,3.53,0,0,1,522,62.2v5.92h-1.64V62.45c0-1.61-.92-2.61-2.26-2.61-1.56,0-2.78,1.27-2.78,3.51v4.77h-1.65Z" transform="translate(0 0)"/><path class="cls-2" d="M529.18,58.33A4.16,4.16,0,0,1,532.55,60V58.52h1.66v9.6h-1.66V66.64a4.19,4.19,0,0,1-3.37,1.67,5,5,0,0,1,0-10Zm.24,1.51a3.48,3.48,0,1,0,3.27,3.48A3.3,3.3,0,0,0,529.42,59.84Z" transform="translate(0 0)"/><path class="cls-2" d="M537.44,53.72h1.65v14.4h-1.65Z" transform="translate(0 0)"/><path class="cls-2" d="M547.87,54.49h3.91c4.19,0,7.26,2.91,7.26,6.81s-3.07,6.82-7.26,6.82h-3.91Zm3.91,12c3.29,0,5.46-2.19,5.46-5.15s-2.17-5.14-5.46-5.14h-2.13V66.45Z" transform="translate(0 0)"/><path class="cls-2" d="M562.57,56a1.18,1.18,0,1,1,0-2.35,1.18,1.18,0,0,1,0,2.35Zm-.84,2.57h1.65v9.6h-1.65Z" transform="translate(0 0)"/><path class="cls-2" d="M570.74,72.32a5.65,5.65,0,0,1-4.51-2l1.15-1.15a4.1,4.1,0,0,0,3.36,1.61A3.07,3.07,0,0,0,574,67.5V66.41a4.11,4.11,0,0,1-3.34,1.69,4.89,4.89,0,0,1,0-9.77A4.09,4.09,0,0,1,574,60V58.52h1.65v9C575.6,70.77,573.49,72.32,570.74,72.32Zm.1-5.76a3.36,3.36,0,1,0-3.25-3.36A3.17,3.17,0,0,0,570.84,66.56Z" transform="translate(0 0)"/><path class="cls-2" d="M579.7,56a1.18,1.18,0,1,1,0-2.35,1.18,1.18,0,0,1,0,2.35Zm-.85,2.57h1.65v9.6h-1.65Z" transform="translate(0 0)"/><path class="cls-2" d="M587.54,68.21a2.7,2.7,0,0,1-2.94-2.94V60h-2V58.52h2V55.85h1.65v2.67H589V60h-2.76v5c0,1.23.56,1.63,1.59,1.63A3.46,3.46,0,0,0,589,66.5V68A4.4,4.4,0,0,1,587.54,68.21Z" transform="translate(0 0)"/><path class="cls-2" d="M595.1,58.33A4.2,4.2,0,0,1,598.48,60V58.52h1.65v9.6h-1.65V66.64a4.23,4.23,0,0,1-3.38,1.67,5,5,0,0,1,0-10Zm.25,1.51a3.48,3.48,0,1,0,3.26,3.48A3.29,3.29,0,0,0,595.35,59.84Z" transform="translate(0 0)"/><path class="cls-2" d="M603.37,53.72H605v14.4h-1.65Z" transform="translate(0 0)"/><path class="cls-2" d="M461.9,77.39h1.79V83.2h7.47V77.39h1.78V91h-1.78V84.87h-7.47V91H461.9Z" transform="translate(0 0)"/><path class="cls-2" d="M480.82,81.23a4.87,4.87,0,0,1,4.55,5.31H477.5A3.39,3.39,0,0,0,483.81,88l1.31.9a5,5,0,1,1-4.3-7.69Zm-3.21,4h6.09a2.87,2.87,0,0,0-2.94-2.52A3.15,3.15,0,0,0,477.61,85.2Z" transform="translate(0 0)"/><path class="cls-2" d="M492,81.23a4.22,4.22,0,0,1,3.38,1.66V81.42h1.65V91h-1.65V89.54A4.23,4.23,0,0,1,492,91.21a5,5,0,0,1,0-10Zm.25,1.51a3.48,3.48,0,1,0,3.26,3.48A3.3,3.3,0,0,0,492.28,82.74Z" transform="translate(0 0)"/><path class="cls-2" d="M500.29,76.62H502V91h-1.66Z" transform="translate(0 0)"/><path class="cls-2" d="M509,91.11A2.7,2.7,0,0,1,506,88.17V82.93h-2V81.42h2V78.75h1.65v2.67h2.76v1.51h-2.76v5c0,1.23.56,1.63,1.59,1.63a3.46,3.46,0,0,0,1.17-.19v1.48A4.4,4.4,0,0,1,509,91.11Z" transform="translate(0 0)"/><path class="cls-2" d="M512.68,76.62h1.65v6.27a3.41,3.41,0,0,1,3.06-1.66A3.53,3.53,0,0,1,521,85.1V91h-1.63V85.35c0-1.61-.92-2.61-2.26-2.61-1.56,0-2.79,1.27-2.79,3.51V91h-1.65Z" transform="translate(0 0)"/><path class="cls-2" d="M534,77.39h1.48l6,13.63h-1.86l-1.75-4h-6.35l-1.75,4H528Zm3.21,8-2.48-5.62-2.47,5.62Z" transform="translate(0 0)"/><path class="cls-2" d="M547.35,95.22a5.66,5.66,0,0,1-4.52-2L544,92.11a4.09,4.09,0,0,0,3.36,1.61,3.07,3.07,0,0,0,3.2-3.32V89.31A4.1,4.1,0,0,1,547.21,91a4.89,4.89,0,0,1,0-9.77,4.1,4.1,0,0,1,3.34,1.66V81.42h1.65v9C552.2,93.66,550.09,95.22,547.35,95.22Zm.09-5.76a3.36,3.36,0,1,0-3.24-3.36A3.18,3.18,0,0,0,547.44,89.46Z" transform="translate(0 0)"/><path class="cls-2" d="M559.79,81.23a4.87,4.87,0,0,1,4.55,5.31h-7.87A3.39,3.39,0,0,0,562.78,88l1.31.9a5,5,0,1,1-4.3-7.69Zm-3.21,4h6.09a2.87,2.87,0,0,0-2.94-2.52A3.15,3.15,0,0,0,556.58,85.2Z" transform="translate(0 0)"/><path class="cls-2" d="M567,81.42h1.65v1.47a3.41,3.41,0,0,1,3.06-1.66,3.53,3.53,0,0,1,3.62,3.87V91h-1.63V85.35c0-1.61-.92-2.61-2.26-2.61-1.56,0-2.79,1.27-2.79,3.51V91H567Z" transform="translate(0 0)"/><path class="cls-2" d="M582.83,91.21a5,5,0,1,1,4.43-7.41l-1.44.8a3.25,3.25,0,0,0-3-1.84,3.46,3.46,0,0,0,0,6.91,3.25,3.25,0,0,0,3-1.84l1.44.81A5,5,0,0,1,582.83,91.21Z" transform="translate(0 0)"/><path class="cls-2" d="M590.43,95l2.09-4.51-4.2-9.1h1.82l3.3,7.27,3.29-7.27h1.84L592.27,95Z" transform="translate(0 0)"/></svg>