diff --git a/examples/basics/README.md b/examples/basics/README.md
index 9013757b7e..96e3e151de 100644
--- a/examples/basics/README.md
+++ b/examples/basics/README.md
@@ -11,7 +11,7 @@ Inside of your Astro project, you'll see the following folders and files:
```
/
├── public/
-│ └── favicon.ico
+│ └── favicon.svg
├── src/
│ ├── components/
│ │ └── Layout.astro
diff --git a/examples/basics/public/favicon.ico b/examples/basics/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/basics/public/favicon.ico and /dev/null differ
diff --git a/examples/blog/public/astro.svg b/examples/basics/public/favicon.svg
similarity index 100%
rename from examples/blog/public/astro.svg
rename to examples/basics/public/favicon.svg
diff --git a/examples/basics/src/layouts/Layout.astro b/examples/basics/src/layouts/Layout.astro
index c757269689..1cea980c53 100644
--- a/examples/basics/src/layouts/Layout.astro
+++ b/examples/basics/src/layouts/Layout.astro
@@ -11,7 +11,7 @@ const { title } = Astro.props as Props;
-
+
{title}
diff --git a/examples/blog/public/favicon.svg b/examples/blog/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/blog/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/blog/src/components/BaseHead.astro b/examples/blog/src/components/BaseHead.astro
index 9c4c8fcdf1..ce60a7e779 100644
--- a/examples/blog/src/components/BaseHead.astro
+++ b/examples/blog/src/components/BaseHead.astro
@@ -15,7 +15,7 @@ const { title, description, image = '/placeholder-social.jpg' } = Astro.props;
-
+
diff --git a/examples/component/demo/public/favicon.ico b/examples/component/demo/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/component/demo/public/favicon.ico and /dev/null differ
diff --git a/examples/component/demo/public/favicon.svg b/examples/component/demo/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/component/demo/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/docs/public/favicon.ico b/examples/docs/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/docs/public/favicon.ico and /dev/null differ
diff --git a/examples/docs/public/favicon.svg b/examples/docs/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/docs/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/docs/src/components/HeadCommon.astro b/examples/docs/src/components/HeadCommon.astro
index 143345c688..3551e5489c 100644
--- a/examples/docs/src/components/HeadCommon.astro
+++ b/examples/docs/src/components/HeadCommon.astro
@@ -9,7 +9,6 @@ import '../styles/index.css';
-
diff --git a/examples/env-vars/public/favicon.ico b/examples/env-vars/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/env-vars/public/favicon.ico and /dev/null differ
diff --git a/examples/env-vars/public/favicon.svg b/examples/env-vars/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/env-vars/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/framework-alpine/public/favicon.ico b/examples/framework-alpine/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/framework-alpine/public/favicon.ico and /dev/null differ
diff --git a/examples/framework-alpine/public/favicon.svg b/examples/framework-alpine/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/framework-alpine/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/framework-alpine/src/pages/index.astro b/examples/framework-alpine/src/pages/index.astro
index 575606e240..701ab551c3 100644
--- a/examples/framework-alpine/src/pages/index.astro
+++ b/examples/framework-alpine/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter.astro';
-
+
+
diff --git a/examples/framework-lit/src/pages/index.astro b/examples/framework-lit/src/pages/index.astro
index 5aafa0534c..4f0dbc3096 100644
--- a/examples/framework-lit/src/pages/index.astro
+++ b/examples/framework-lit/src/pages/index.astro
@@ -12,7 +12,7 @@ import { MyCounter } from '../components/my-counter.js';
-
+
Demo
diff --git a/examples/framework-multiple/public/favicon.ico b/examples/framework-multiple/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/framework-multiple/public/favicon.ico and /dev/null differ
diff --git a/examples/framework-multiple/public/favicon.svg b/examples/framework-multiple/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/framework-multiple/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/framework-multiple/src/pages/index.astro b/examples/framework-multiple/src/pages/index.astro
index 87f85d2dd8..94630aa1eb 100644
--- a/examples/framework-multiple/src/pages/index.astro
+++ b/examples/framework-multiple/src/pages/index.astro
@@ -20,7 +20,7 @@ import SvelteCounter from '../components/SvelteCounter.svelte';
-
+
diff --git a/examples/framework-preact/public/favicon.ico b/examples/framework-preact/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/framework-preact/public/favicon.ico and /dev/null differ
diff --git a/examples/framework-preact/public/favicon.svg b/examples/framework-preact/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/framework-preact/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/framework-preact/src/pages/index.astro b/examples/framework-preact/src/pages/index.astro
index 2810ca6589..a6565f6c1b 100644
--- a/examples/framework-preact/src/pages/index.astro
+++ b/examples/framework-preact/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter';
-
+
+
diff --git a/examples/framework-react/src/pages/index.astro b/examples/framework-react/src/pages/index.astro
index 4810006a67..cd7bdc52ef 100644
--- a/examples/framework-react/src/pages/index.astro
+++ b/examples/framework-react/src/pages/index.astro
@@ -14,7 +14,7 @@ const someProps = {
-
+
+
diff --git a/examples/framework-solid/src/pages/index.astro b/examples/framework-solid/src/pages/index.astro
index 160c742272..5ff8c9fb6a 100644
--- a/examples/framework-solid/src/pages/index.astro
+++ b/examples/framework-solid/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter';
-
+
+
diff --git a/examples/framework-svelte/src/pages/index.astro b/examples/framework-svelte/src/pages/index.astro
index 08379ff893..3314afe498 100644
--- a/examples/framework-svelte/src/pages/index.astro
+++ b/examples/framework-svelte/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter.svelte';
-
+
+
diff --git a/examples/framework-vue/src/pages/index.astro b/examples/framework-vue/src/pages/index.astro
index 8d0b886650..85b6594b10 100644
--- a/examples/framework-vue/src/pages/index.astro
+++ b/examples/framework-vue/src/pages/index.astro
@@ -11,7 +11,7 @@ import Counter from '../components/Counter.vue';
-
+
+
diff --git a/examples/minimal/src/pages/index.astro b/examples/minimal/src/pages/index.astro
index 554de1a39d..7264ff502d 100644
--- a/examples/minimal/src/pages/index.astro
+++ b/examples/minimal/src/pages/index.astro
@@ -4,6 +4,7 @@
+
Astro
diff --git a/examples/non-html-pages/public/favicon.ico b/examples/non-html-pages/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/non-html-pages/public/favicon.ico and /dev/null differ
diff --git a/examples/non-html-pages/public/favicon.svg b/examples/non-html-pages/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/non-html-pages/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/portfolio/public/favicon.ico b/examples/portfolio/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/portfolio/public/favicon.ico and /dev/null differ
diff --git a/examples/portfolio/public/favicon.svg b/examples/portfolio/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/portfolio/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/portfolio/src/components/MainHead.astro b/examples/portfolio/src/components/MainHead.astro
index ea21f76d27..5e4e49b976 100644
--- a/examples/portfolio/src/components/MainHead.astro
+++ b/examples/portfolio/src/components/MainHead.astro
@@ -12,7 +12,7 @@ const {
{title}
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examples/subpath/public/favicon.ico b/examples/subpath/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/subpath/public/favicon.ico and /dev/null differ
diff --git a/examples/subpath/public/favicon.svg b/examples/subpath/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/subpath/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/subpath/src/pages/index.astro b/examples/subpath/src/pages/index.astro
index d69690ecac..1a86a554bc 100644
--- a/examples/subpath/src/pages/index.astro
+++ b/examples/subpath/src/pages/index.astro
@@ -9,7 +9,7 @@ import Time from '../components/Time.jsx';
-
+
Welcome to Astro
diff --git a/examples/with-markdown-plugins/public/favicon.ico b/examples/with-markdown-plugins/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/with-markdown-plugins/public/favicon.ico and /dev/null differ
diff --git a/examples/with-markdown-plugins/public/favicon.svg b/examples/with-markdown-plugins/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/with-markdown-plugins/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/with-markdown-plugins/src/layouts/main.astro b/examples/with-markdown-plugins/src/layouts/main.astro
index 2aae56959c..80e81fb42a 100644
--- a/examples/with-markdown-plugins/src/layouts/main.astro
+++ b/examples/with-markdown-plugins/src/layouts/main.astro
@@ -8,7 +8,7 @@ const { content } = Astro.props;
-
+
{content.title}
+
diff --git a/examples/with-markdown-shiki/src/layouts/main.astro b/examples/with-markdown-shiki/src/layouts/main.astro
index 39d74755dd..7f5bc2ac21 100644
--- a/examples/with-markdown-shiki/src/layouts/main.astro
+++ b/examples/with-markdown-shiki/src/layouts/main.astro
@@ -8,7 +8,7 @@ const { content } = Astro.props;
-
+
{content.title}
diff --git a/examples/with-mdx/public/favicon.ico b/examples/with-mdx/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/with-mdx/public/favicon.ico and /dev/null differ
diff --git a/examples/with-mdx/public/favicon.svg b/examples/with-mdx/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/with-mdx/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/with-nanostores/public/favicon.ico b/examples/with-nanostores/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/with-nanostores/public/favicon.ico and /dev/null differ
diff --git a/examples/with-nanostores/public/favicon.svg b/examples/with-nanostores/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/with-nanostores/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/with-nanostores/src/layouts/Layout.astro b/examples/with-nanostores/src/layouts/Layout.astro
index 5282ddf909..dae8c6e1ab 100644
--- a/examples/with-nanostores/src/layouts/Layout.astro
+++ b/examples/with-nanostores/src/layouts/Layout.astro
@@ -15,7 +15,7 @@ const { title } = Astro.props as Props;
-
+
{title}
diff --git a/examples/with-tailwindcss/public/favicon.ico b/examples/with-tailwindcss/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/with-tailwindcss/public/favicon.ico and /dev/null differ
diff --git a/examples/with-tailwindcss/public/favicon.svg b/examples/with-tailwindcss/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/with-tailwindcss/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/with-tailwindcss/src/layouts/main.astro b/examples/with-tailwindcss/src/layouts/main.astro
index dc4feb87e1..63bee5d252 100644
--- a/examples/with-tailwindcss/src/layouts/main.astro
+++ b/examples/with-tailwindcss/src/layouts/main.astro
@@ -6,7 +6,7 @@ const { content } = Astro.props;
-
+
{content.title}
diff --git a/examples/with-tailwindcss/src/pages/index.astro b/examples/with-tailwindcss/src/pages/index.astro
index a36b41eda1..5a0e50ab19 100644
--- a/examples/with-tailwindcss/src/pages/index.astro
+++ b/examples/with-tailwindcss/src/pages/index.astro
@@ -10,7 +10,7 @@ import Button from '../components/Button.astro';
-
+
Astro + TailwindCSS
diff --git a/examples/with-vite-plugin-pwa/public/favicon.ico b/examples/with-vite-plugin-pwa/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/with-vite-plugin-pwa/public/favicon.ico and /dev/null differ
diff --git a/examples/with-vite-plugin-pwa/public/favicon.svg b/examples/with-vite-plugin-pwa/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/with-vite-plugin-pwa/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/with-vite-plugin-pwa/src/pages/index.astro b/examples/with-vite-plugin-pwa/src/pages/index.astro
index 4a9bca7e28..af2303f571 100644
--- a/examples/with-vite-plugin-pwa/src/pages/index.astro
+++ b/examples/with-vite-plugin-pwa/src/pages/index.astro
@@ -4,7 +4,7 @@
-
+
Welcome to Astro
diff --git a/examples/with-vitest/public/favicon.ico b/examples/with-vitest/public/favicon.ico
deleted file mode 100644
index 578ad458b8..0000000000
Binary files a/examples/with-vitest/public/favicon.ico and /dev/null differ
diff --git a/examples/with-vitest/public/favicon.svg b/examples/with-vitest/public/favicon.svg
new file mode 100644
index 0000000000..0f39062978
--- /dev/null
+++ b/examples/with-vitest/public/favicon.svg
@@ -0,0 +1,13 @@
+
diff --git a/examples/with-vitest/src/pages/index.astro b/examples/with-vitest/src/pages/index.astro
index 4389d5d255..7264ff502d 100644
--- a/examples/with-vitest/src/pages/index.astro
+++ b/examples/with-vitest/src/pages/index.astro
@@ -4,7 +4,9 @@
+
+
Astro