diff --git a/htdocs/dev/tests/colons.html b/htdocs/dev/tests/colons.html
index 647be092..a71e5f43 100755
--- a/htdocs/dev/tests/colons.html
+++ b/htdocs/dev/tests/colons.html
@@ -10,7 +10,7 @@
   <body>
     <div id="banner">
       <h1 id="title">
-        <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="../../images/no_w3c.png" /></a>
+        <a href="https://www.w3.org/"><img alt="W3C" id="logo" src="../../images/no_w3c.png" /></a>
         <a href="../../"><span>Markup Validation Service</span></a>
       </h1>
       <p id="tagline">Check the markup (HTML, XHTML, …) of Web documents</p>
diff --git a/htdocs/dev/tests/nonSGML-chars.html b/htdocs/dev/tests/nonSGML-chars.html
index d593e759..8164dcd9 100755
--- a/htdocs/dev/tests/nonSGML-chars.html
+++ b/htdocs/dev/tests/nonSGML-chars.html
@@ -10,7 +10,7 @@
   <body>
     <div id="banner">
       <h1 id="title">
-        <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="../../images/no_w3c.png" /></a>
+        <a href="https://www.w3.org/"><img alt="W3C" id="logo" src="../../images/no_w3c.png" /></a>
 	<a href="../../"><span>Markup Validation Service</span></a>
       </h1>
       <p id="tagline">Check the markup (HTML, XHTML, …) of Web documents</p>
diff --git a/htdocs/header.html b/htdocs/header.html
index 1d3bc577..dcd0b548 100755
--- a/htdocs/header.html
+++ b/htdocs/header.html
@@ -6,7 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
     <title><!--#echo var="title" --></title>
     <link rel="help" href="mailto:www-validator@w3.org">
-    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon">
+    <link rel="icon" type="image/png" href="https://www.w3.org/assets/logos/w3c-2025/favicons/favicon-32.png">
     <link rel="start" href="<!--#echo var="relroot" -->" title="Home Page">
     <link rel="stylesheet" href="<!--#echo var="relroot" -->style/base" type="text/css" media="all">
     <meta name="keywords" content="HTML, HyperText Markup Language, Validation,
@@ -19,7 +19,7 @@
     <div id="banner">
       <h1 id="title">
         <a href="https://www.w3.org/">
-          <img alt="W3C Logo" width="110" height="61" id="logo" src="<!--#echo var="relroot" -->images/<!--#if expr="$ENV != 'w3.org'" -->no_<!--#endif -->w3c.png" />
+          <img alt="W3C Logo" id="logo" src="<!--#if expr="$ENV != 'w3.org'" --><!--#echo var="relroot" -->images/no_w3c.png<!--#else -->https://www.w3.org/assets/logos/w3c-2025/svg/margins/w3c-letters-bg-white.svg<!--#endif -->" />
         </a>
         <a href="<!--#echo var="relroot" -->"><span>Markup Validation Service</span></a>
       </h1>
diff --git a/htdocs/images/favicon.ico b/htdocs/images/favicon.ico
deleted file mode 100644
index 0e7030c3..00000000
Binary files a/htdocs/images/favicon.ico and /dev/null differ
diff --git a/htdocs/images/w3c.png b/htdocs/images/w3c.png
deleted file mode 100644
index 81355759..00000000
Binary files a/htdocs/images/w3c.png and /dev/null differ
diff --git a/htdocs/no_referer.asis b/htdocs/no_referer.asis
index e1756e70..d700638c 100644
--- a/htdocs/no_referer.asis
+++ b/htdocs/no_referer.asis
@@ -22,7 +22,7 @@ Content-type: text/html
     
     <div id="banner">
      <h1 id="title">
-       <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="/images/w3c.png" /></a>
+       <a href="https://www.w3.org/"><img alt="W3C" id="logo" src="https://www.w3.org/assets/logos/w3c-2025/svg/margins/w3c-letters-bg-white.svg" /></a>
  			<a href="/"><span>Markup Validation Service</span></a>
 
        </h1>
diff --git a/htdocs/services.html b/htdocs/services.html
index 36ed519d..cc32f7c6 100644
--- a/htdocs/services.html
+++ b/htdocs/services.html
@@ -5,9 +5,9 @@
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
     <title>W3C Validation Services</title>
     <link rev="made" href="mailto:www-validator@w3.org" />
-    <link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
+    <link rel="icon" type="image/png" href="https://www.w3.org/assets/logos/w3c-2025/favicons/favicon-32.png" />
     <link rev="start" href="/" title="Home Page" />
-    <link rel="stylesheet" href="./style/base" type="text/css" media="all" />
+    <link rel="stylesheet" href="./style/base.css" type="text/css" media="all" />
     <meta name="keywords" content="HTML, HyperText Markup Language, Validation,
       W3C Markup Validation Service, Validator.nu, Feed, Internationalization, i18n, CSS Validator, Link Checker" />
   </head>
@@ -15,7 +15,7 @@
   <body>
    <div id="banner">
     <h1 id="title">
-      <a href="https://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="/images/w3c.png" /></a>
+      <a href="https://www.w3.org/"><img alt="W3C" id="logo" src="https://www.w3.org/assets/logos/w3c-2025/svg/margins/w3c-letters-bg-white.svg" /></a>
 			<a href="/services"><span>W3C Validation Services</span></a>
       </h1>
       <p id="tagline">Providing standards conformance checking services to the Web community</p>
diff --git a/htdocs/style/base.css b/htdocs/style/base.css
index b57142eb..d8f08704 100644
--- a/htdocs/style/base.css
+++ b/htdocs/style/base.css
@@ -309,6 +309,14 @@ tr.subchoice th label {
 	background-color: inherit;
 }
 
+#logo {
+  border-radius: 10px;
+  height: 100px;
+  margin-left: 20px;
+  margin-top: 10px;
+  width: 100px;
+}
+
 h1 span {
 	border-bottom: 1px solid #6383b1;
 	border-color: #4e6f9e;
@@ -340,7 +348,7 @@ h1 span {
 
 #tagline {
 	font-size: 0.7em;
-	margin: -2em 0 0 12.1em;
+	margin: -4em 0 4em 13em;
 	padding-bottom: 1em;
 	letter-spacing: 0.1em;
 	line-height: 100% !important;
diff --git a/misc/mkrelease.sh b/misc/mkrelease.sh
index f256518e..7b55721d 100755
--- a/misc/mkrelease.sh
+++ b/misc/mkrelease.sh
@@ -41,9 +41,6 @@ rm -f validator-$version/misc/mkrelease.sh
 rm -f validator-$version/htdocs/no_referer.asis
 rm -rf validator-$version/misc/bundle
 
-cp validator-$version/htdocs/images/no_w3c.png \
-  validator-$version/htdocs/images/w3c.png
-
 find . -type d | xargs -r chmod 755
 find . -type f | xargs -r chmod 644
 chmod 755 validator-$version/httpd/cgi-bin/check
diff --git a/share/templates/en_US/header.tmpl b/share/templates/en_US/header.tmpl
index e7d636fd..f1cb7aa5 100644
--- a/share/templates/en_US/header.tmpl
+++ b/share/templates/en_US/header.tmpl
@@ -15,7 +15,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF></TMPL_U
     <title>
             <TMPL_IF NAME="valid_status">[<TMPL_VAR NAME="valid_status">]</TMPL_IF>
             <TMPL_IF NAME="page_title_url">Markup Validation of <TMPL_VAR NAME="page_title_url" ESCAPE="HTML"><TMPL_ELSE><TMPL_IF NAME="page_title"><TMPL_VAR NAME="page_title" ESCAPE="HTML"><TMPL_ELSE>Validation Results</TMPL_IF></TMPL_IF> - W3C Markup Validator</title>
-        <TMPL_IF NAME="is_feedback"><link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" /><TMPL_ELSE><link rel="icon" href="<TMPL_IF NAME="VALID">data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%02%00%00%00%90%91h6%00%00%00%19IDAT(%91c%0C%DD%10%C5%40%0A%60%22I%F5%A8%86Q%0DCJ%03%00dy%01%7F%0C%9F0%7D%00%00%00%00IEND%AEB%60%82<TMPL_ELSE>data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%02%00%00%00%90%91h6%00%00%00%19IDAT(%91c%BCd%AB%C2%40%0A%60%22I%F5%A8%86Q%0DCJ%03%00%DE%B5%01S%07%88%8FG%00%00%00%00IEND%AEB%60%82</TMPL_IF>" type="image/png" /></TMPL_IF>
+        <TMPL_IF NAME="is_feedback"><link rel="icon" type="image/png" href="https://www.w3.org/assets/logos/w3c-2025/favicons/favicon-32.png" /><TMPL_ELSE><link rel="icon" href="<TMPL_IF NAME="VALID">data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%02%00%00%00%90%91h6%00%00%00%19IDAT(%91c%0C%DD%10%C5%40%0A%60%22I%F5%A8%86Q%0DCJ%03%00dy%01%7F%0C%9F0%7D%00%00%00%00IEND%AEB%60%82<TMPL_ELSE>data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%02%00%00%00%90%91h6%00%00%00%19IDAT(%91c%BCd%AB%C2%40%0A%60%22I%F5%A8%86Q%0DCJ%03%00%DE%B5%01S%07%88%8FG%00%00%00%00IEND%AEB%60%82</TMPL_IF>" type="image/png" /></TMPL_IF>
     <link rev="made" href="mailto:www-validator@w3.org" />
     <link rev="start" href="./" title="Home Page" />
     <link rel="stylesheet" href="./style/base" type="text/css" media="all" />
@@ -29,7 +29,7 @@ X-W3C-Validator-Warnings: <TMPL_VAR NAME="valid_warnings_num"></TMPL_IF></TMPL_U
     
     <div id="banner">
      <h1 id="title">
-       <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="./images/<TMPL_UNLESS NAME=ENV>no_</TMPL_UNLESS>w3c.png" /></a>
+       <a href="https://www.w3.org/"><img alt="W3C" id="logo" src="<TMPL_IF NAME=ENV>https://www.w3.org/assets/logos/w3c-2025/svg/margins/w3c-letters-bg-white.svg<TMPL_ELSE>./images/no_w3c.png</TMPL_IF>" /></a>
  			<a href="./"><span>Markup Validation Service</span></a>
        </h1>
        <p id="tagline">Check the markup (HTML, XHTML, …) of Web documents</p>
