diff --git a/docgen/json/templates/cyclonedx/base.html b/docgen/json/templates/cyclonedx/base.html
index fd0e9093..dfbba7c5 100644
--- a/docgen/json/templates/cyclonedx/base.html
+++ b/docgen/json/templates/cyclonedx/base.html
@@ -9,15 +9,15 @@
     <meta name="twitter:card" content="summary_large_image"/>
     <meta name="twitter:site" content="@CycloneDX_Spec"/>
     <meta name="twitter:title" content="${quotedTitle}"/>
-    <meta name="twitter:image" content="https://cyclonedx.org/theme/assets/images/CycloneDX-Twitter-Card.png"/>
+    <meta name="twitter:image" content="https://cyclonedx.org/images/CycloneDX-Social-Card.png"/>
     <meta name="twitter:description" content="${quotedTitle}"/>
     <meta name="description" content="${quotedTitle}"/>
     <meta property="og:description" content="${quotedTitle}"/>
     <meta property="og:title" content="${quotedTitle}"/>
     <meta property="og:locale" content="en_US"/>
     <meta property="og:type" content="website" />
-    <meta property="og:image" content="https://cyclonedx.org/theme/assets/images/CycloneDX-Twitter-Card.png" />
-    <link rel="icon" href="https://cyclonedx.org/cyclonedx-icon.png" type="image/png"/>
+    <meta property="og:image" content="https://cyclonedx.org/images/CycloneDX-Social-Card.png" />
+    <link href="/favicon.ico" rel="shortcut icon" type="image/ico" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/4.6.2/css/bootstrap.min.css" integrity="sha512-rt/SrQ4UNIaGfDyEXZtNcyWvQeOq0QLygHluFQcSjaGB04IxWhal71tKuzP6K8eYXYB6vJV4pHkXcmFGGQ1/0w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" integrity="sha512-SfTiTlX6kk+qitfevl/7LibUOeJWlt9rbyDn92a1DqWOw9vWG2MFoays0sgObmWazO5BQPiFucnnEAjpAB+/Sw==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     <link rel="stylesheet" type="text/css" href="schema_doc.css">
@@ -29,7 +29,7 @@
 <body class="blue" data-spy="scroll" data-target=".js-scrollspy" onload="anchorOnLoad();" id="root">
 
 <nav class="navbar fixed-top navbar-expand-sm navbar-inverse">
-    <a href="/" class="navbar-brand site-header__logo"><img src="https://cdx-staging.pages.dev/images/logo-all-white.svg" height="48" width="276"></img></a>
+    <a href="/" class="navbar-brand site-header__logo"><img src="https://cyclonedx.org/images/logo-all-white.svg" height="48" width="276"></img></a>
     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarScroll" aria-controls="navbarScroll" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
     </button>
diff --git a/docgen/xml/xs3p.xsl b/docgen/xml/xs3p.xsl
index 40a4220f..65e2275f 100644
--- a/docgen/xml/xs3p.xsl
+++ b/docgen/xml/xs3p.xsl
@@ -280,16 +280,16 @@
             <meta name="twitter:card" content="summary_large_image"/>
             <meta name="twitter:site" content="@CycloneDX_Spec"/>
             <meta name="twitter:title"><xsl:attribute name="content"><xsl:value-of select="$actualTitle"/></xsl:attribute></meta>
-            <meta name="twitter:image" content="https://cyclonedx.org/theme/assets/images/CycloneDX-Twitter-Card.png"/>
+            <meta name="twitter:image" content="https://cyclonedx.org/images/CycloneDX-Social-Card.png"/>
             <meta name="twitter:description"><xsl:attribute name="content"><xsl:value-of select="$actualTitle"/></xsl:attribute></meta>
             <meta name="description"><xsl:attribute name="content"><xsl:value-of select="$actualTitle"/></xsl:attribute></meta>
             <meta property="og:description"><xsl:attribute name="content"><xsl:value-of select="$actualTitle"/></xsl:attribute></meta>
             <meta property="og:title"><xsl:attribute name="content"><xsl:value-of select="$actualTitle"/></xsl:attribute></meta>
             <meta property="og:locale" content="en_US"/>
             <meta property="og:type" content="website" />
-            <meta property="og:image" content="https://cyclonedx.org/theme/assets/images/CycloneDX-Twitter-Card.png" />
+            <meta property="og:image" content="https://cyclonedx.org/images/CycloneDX-Social-Card.png" />
 
-            <link rel="icon" href="https://cyclonedx.org/cyclonedx-icon.png" type="image/png"/>
+            <link href="/favicon.ico" rel="shortcut icon" type="image/ico" />
 
             <!-- Set base URL to use in working out relative paths -->
             <xsl:if test="$baseURL != ''">
@@ -332,7 +332,7 @@
                          <span class="icon-bar"><xsl:text> </xsl:text></span>
                       </button>
                       -->
-                     <a href="/" class="navbar-brand site-header__logo"><img src="https://cdx-staging.pages.dev/images/logo-all-white.svg" height="48" width="276" /></a>
+                     <a href="/" class="navbar-brand site-header__logo"><img src="https://cyclonedx.org/images/logo-all-white.svg" height="48" width="276" /></a>
 
                      <!-- Version selection dropdown -->
                      <div style="display:flex; align-items:center; height:100%;">
