diff --git a/src/main/java/run/halo/app/controller/content/MainController.java b/src/main/java/run/halo/app/controller/content/MainController.java
index 740901080..be84b0cfc 100644
--- a/src/main/java/run/halo/app/controller/content/MainController.java
+++ b/src/main/java/run/halo/app/controller/content/MainController.java
@@ -63,4 +63,12 @@ public class MainController {
             response.sendRedirect(blogLogo);
         }
     }
+
+    @GetMapping("/favicon.ico")
+    public void favicon(HttpServletResponse response) throws IOException {
+        String favicon = optionService.getByProperty(BlogProperties.BLOG_FAVICON).orElse("").toString();
+        if (StringUtils.isNotEmpty(favicon)) {
+            response.sendRedirect(favicon);
+        }
+    }
 }
diff --git a/src/main/java/run/halo/app/controller/core/CommonController.java b/src/main/java/run/halo/app/controller/core/CommonController.java
index dc3fcfd0c..bae5ee298 100644
--- a/src/main/java/run/halo/app/controller/core/CommonController.java
+++ b/src/main/java/run/halo/app/controller/core/CommonController.java
@@ -75,7 +75,7 @@ public class CommonController implements ErrorController {
             return "common/error/404";
         }
         StrBuilder path = new StrBuilder("themes/");
-        path.append(themeService.getActivatedThemeId());
+        path.append(themeService.getActivatedTheme().getFolderName());
         path.append("/404");
         return path.toString();
     }
@@ -91,7 +91,7 @@ public class CommonController implements ErrorController {
             return "common/error/500";
         }
         StrBuilder path = new StrBuilder("themes/");
-        path.append(themeService.getActivatedThemeId());
+        path.append(themeService.getActivatedTheme().getFolderName());
         path.append("/500");
         return path.toString();
     }
diff --git a/src/main/resources/templates/common/macro/common_macro.ftl b/src/main/resources/templates/common/macro/common_macro.ftl
index 105195a3c..1df74279b 100644
--- a/src/main/resources/templates/common/macro/common_macro.ftl
+++ b/src/main/resources/templates/common/macro/common_macro.ftl
@@ -12,9 +12,7 @@
 
 <#-- favicon -->
 <#macro favicon>
-    <#if options.blog_favicon??>
-        <link rel="shortcut icon" type="images/x-icon" href="${options.blog_favicon}">
-    </#if>
+    <link rel="shortcut icon" type="images/x-icon" href="${options.blog_favicon!}">
 </#macro>
 
 <#-- 站点验证代码 -->