diff --git a/_layouts/base.html b/_layouts/base.html
index 656bc3fb..f1f9d1c2 100755
--- a/_layouts/base.html
+++ b/_layouts/base.html
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
- 		<link id="defaultIcon1" rel="shortcut icon" href="{{ site.baseurl }}assets/favicon_06.png" />
+        <link id="defaultIcon1" rel="shortcut icon" href="{{ site.baseurl }}/assets/favicon_06.png" />
         <title>{{ page.title }}</title>
         <link href="{{ site.baseurl }}/css/googleFonts.css" rel="stylesheet" type="text/css" >
         <meta name="robots" content="index,follow,NOODP" />
diff --git a/js/main.js b/js/main.js
index cc9809bc..4050c5fe 100755
--- a/js/main.js
+++ b/js/main.js
@@ -16,7 +16,25 @@ $(document).ready(function () {
     if (logoID < 10) {
         logoID = "0" + logoID;
     }
-    document.querySelector('#defaultIcon1').href = 'https://www.sugarlabs.org/assets/favicon_' + logoID + '.png';
+
+    var defaultIcon = document.querySelector('#defaultIcon1');
+    if (defaultIcon) {
+        var logoID = colorIndex + 1;
+        if (logoID < 10) {
+            logoID = "0" + logoID;
+        }
+        
+        var rootUrl = '';
+        var baseTag = document.querySelector('base');
+        if (baseTag && baseTag.href) {
+            rootUrl = baseTag.href;
+        } else {
+            rootUrl = window.location.protocol + '//' + window.location.host + '/';
+        }
+        
+        defaultIcon.href = rootUrl + 'assets/favicon_' + logoID + '.png';
+    }
+
     var h = document.querySelector('.logo1').innerHTML;
     h = h.replace(/033cd2/g, selectedColors[0]);
     h = h.replace(/78e600/g, selectedColors[1]);