diff --git a/website/layouts/index.html b/website/layouts/index.html
index eef47f9..913d579 100644
--- a/website/layouts/index.html
+++ b/website/layouts/index.html
@@ -1 +1 @@
-<meta http-equiv="refresh" content="0; url=https://lettre.github.io/lettre/getting-started/intro/"/>
+<meta http-equiv="refresh" content="0; url={{ .Site.BaseURL }}/getting-started/intro/"/>
diff --git a/website/layouts/partials/favicon.html b/website/layouts/partials/favicon.html
new file mode 100644
index 0000000..22c61ac
--- /dev/null
+++ b/website/layouts/partials/favicon.html
@@ -0,0 +1 @@
+<link rel="shortcut icon" href="{{ .Site.BaseURL }}/images/favicon.png" type="image/x-icon" />
diff --git a/website/layouts/partials/logo.html b/website/layouts/partials/logo.html
index 1ff23ae..855dd8b 100644
--- a/website/layouts/partials/logo.html
+++ b/website/layouts/partials/logo.html
@@ -1 +1 @@
-<img src="../images/logo50.png" />
+<a href="{{ .Site.BaseURL }}/getting-started/intro/"><img src="{{ .Site.BaseURL }}/images/logo50.png" /></a>