diff --git a/theme/src/main/assets/page.st b/theme/src/main/assets/page.st
index d5c51c5..f021ae9 100644
--- a/theme/src/main/assets/page.st
+++ b/theme/src/main/assets/page.st
@@ -46,7 +46,7 @@ $!
     $ elseif (page.properties.("material.author")) $
       <meta name="author" content="$page.properties.("site.author")$">
     $ endif $
-    <link rel="shortcut icon" href="$page.base$$page.properties.("material.favicon")$">
+    <link rel="shortcut icon" href="$page.properties.("assets.hostname")$$page.base$$page.properties.("material.favicon")$">
     $ if (page.properties.("title")) $
       <title>$page.properties.("title")$</title>
     $ elseif (page.title) $
diff --git a/theme/src/main/assets/partials/nav.st b/theme/src/main/assets/partials/nav.st
index f0471b9..521b9d2 100644
--- a/theme/src/main/assets/partials/nav.st
+++ b/theme/src/main/assets/partials/nav.st
@@ -30,7 +30,7 @@ $!
         <i class="md-icon">$page.properties.("material.logo.icon")$</i>
       $ else $
         $ if (page.properties.("material.logo.uri")) $
-          <img src="$page.properties.("material.logo.uri")$" width="24" height="24">
+          <img src="$page.properties.("assets.hostname")$$page.base$$page.properties.("material.logo.uri")$" width="24" height="24">
         $ else $
           <img src="$page.base$$page.properties.("material.logo")$" width="24" height="24">
         $endif$