diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
index cebf987ac..0f392a407 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/BackupController.java
@@ -231,7 +231,7 @@ public class BackupController {
                 content.put("fileName", file.getName());
                 content.put("createAt", HaloUtils.getCreateTime(srcPath));
                 content.put("size", HaloUtils.parseSize(file.length()));
-                mailService.sendAttachMail(user.getUserEmail(), "有新的备份！", content, "common/mail/mail_attach.ftl", srcPath);
+                mailService.sendAttachMail(user.getUserEmail(), "有新的备份！", content, "common/mail_template/mail_attach.ftl", srcPath);
             } catch (Exception e) {
                 log.error("邮件服务器未配置：{}", e.getMessage());
             }
diff --git a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
index 1dac2bf62..1f39ddec6 100755
--- a/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/admin/CommentController.java
@@ -235,7 +235,7 @@ public class CommentController extends BaseController {
                     map.put("replyContent", commentContent);
                     map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));
                     mailService.sendTemplateMail(
-                            lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl");
+                            lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论有了新回复", map, "common/mail_template/mail_reply.ftl");
                 }
             }
         }
@@ -276,7 +276,7 @@ public class CommentController extends BaseController {
                         map.put("author", user.getUserDisplayName());
                         mailService.sendTemplateMail(
                                 comment.getCommentAuthorEmail(),
-                                "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail/mail_passed.ftl");
+                                "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()) + "的评论已审核通过！", map, "common/mail_template/mail_passed.ftl");
                     }
                 } catch (Exception e) {
                     log.error("邮件服务器未配置：{}", e.getMessage());
diff --git a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
index 59d4bcd89..c86e1295d 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/core/CommonController.java
@@ -46,7 +46,7 @@ public class CommonController implements ErrorController {
      */
     @GetMapping(value = "/404")
     public String fourZeroFour() {
-        return "common/404";
+        return "common/error/404";
     }
 
     /**
@@ -57,7 +57,7 @@ public class CommonController implements ErrorController {
      */
     @GetMapping(value = "/500")
     public String fiveZeroZero() {
-        return "common/500";
+        return "common/error/500";
     }
 
     /**
diff --git a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
index e697bc7e6..8ccf393eb 100644
--- a/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
+++ b/src/main/java/cc/ryanc/halo/web/controller/front/FrontCommentController.java
@@ -175,7 +175,7 @@ public class FrontCommentController {
                     }
                     map.put("visitor", comment.getCommentAuthor());
                     map.put("commentContent", comment.getCommentContent());
-                    mailService.sendTemplateMail(userService.findUser().getUserEmail(), "有新的评论", map, "common/mail/mail_admin.ftl");
+                    mailService.sendTemplateMail(userService.findUser().getUserEmail(), "有新的评论", map, "common/mail_template/mail_admin.ftl");
                 } catch (Exception e) {
                     log.error("邮件服务器未配置：{}", e.getMessage());
                 }
@@ -216,7 +216,7 @@ public class FrontCommentController {
                     map.put("replyContent", comment.getCommentContent());
                     map.put("blogUrl", HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_URL.getProp()));
                     mailService.sendTemplateMail(
-                            lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()) + "的评论有了新回复", map, "common/mail/mail_reply.ftl");
+                            lastComment.getCommentAuthorEmail(), "您在" + HaloConst.OPTIONS.get(BlogPropertiesEnum.BLOG_TITLE.getProp()) + "的评论有了新回复", map, "common/mail_template/mail_reply.ftl");
                 }
             }
         }
diff --git a/src/main/resources/templates/admin/admin_option.ftl b/src/main/resources/templates/admin/admin_option.ftl
index f880efc6e..94653338c 100755
--- a/src/main/resources/templates/admin/admin_option.ftl
+++ b/src/main/resources/templates/admin/admin_option.ftl
@@ -88,6 +88,17 @@
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="form-group">
+                                            <label for="blogFavicon" class="col-lg-2 col-sm-4 control-label">Favicon：</label>
+                                            <div class="col-lg-4 col-sm-8">
+                                                <div class="input-group">
+                                                    <input type="text" class="form-control selectData" id="blogFavicon" name="blog_favicon" value="${options.blog_favicon?if_exists}">
+                                                    <span class="input-group-btn">
+                                                        <button class="btn btn-default " type="button" onclick="openAttach('blogFavicon')">选择</button>
+                                                    </span>
+                                                </div>
+                                            </div>
+                                        </div>
                                         <div class="form-group">
                                             <label for="blogFooterInfo" class="col-lg-2 col-sm-4 control-label">页脚信息：
                                                 <span data-toggle="tooltip" data-placement="top" title="支持HTML" style="cursor: pointer">
diff --git a/src/main/resources/templates/common/404.ftl b/src/main/resources/templates/common/error/404.ftl
similarity index 100%
rename from src/main/resources/templates/common/404.ftl
rename to src/main/resources/templates/common/error/404.ftl
diff --git a/src/main/resources/templates/common/500.ftl b/src/main/resources/templates/common/error/500.ftl
similarity index 100%
rename from src/main/resources/templates/common/500.ftl
rename to src/main/resources/templates/common/error/500.ftl
diff --git a/src/main/resources/templates/common/macro/common_macro.ftl b/src/main/resources/templates/common/macro/common_macro.ftl
new file mode 100644
index 000000000..cb94ccc2b
--- /dev/null
+++ b/src/main/resources/templates/common/macro/common_macro.ftl
@@ -0,0 +1,16 @@
+<!-- 统计代码 -->
+<#macro statistics>
+    ${options.statistics_code?if_exists}
+</#macro>
+
+<!-- 页脚信息 -->
+<#macro footer_info>
+    ${options.blog_footer_info?if_exists}
+</#macro>
+
+<!-- favicon -->
+<#macro favicon>
+    <#if options.blog_favicon??>
+        <link rel="shortcut icon" type="images/x-icon" href="${options.blog_favicon}">
+    </#if>
+</#macro>
diff --git a/src/main/resources/templates/common/mail/mail_admin.ftl b/src/main/resources/templates/common/mail_template/mail_admin.ftl
similarity index 100%
rename from src/main/resources/templates/common/mail/mail_admin.ftl
rename to src/main/resources/templates/common/mail_template/mail_admin.ftl
diff --git a/src/main/resources/templates/common/mail/mail_attach.ftl b/src/main/resources/templates/common/mail_template/mail_attach.ftl
similarity index 100%
rename from src/main/resources/templates/common/mail/mail_attach.ftl
rename to src/main/resources/templates/common/mail_template/mail_attach.ftl
diff --git a/src/main/resources/templates/common/mail/mail_passed.ftl b/src/main/resources/templates/common/mail_template/mail_passed.ftl
similarity index 100%
rename from src/main/resources/templates/common/mail/mail_passed.ftl
rename to src/main/resources/templates/common/mail_template/mail_passed.ftl
diff --git a/src/main/resources/templates/common/mail/mail_reply.ftl b/src/main/resources/templates/common/mail_template/mail_reply.ftl
similarity index 100%
rename from src/main/resources/templates/common/mail/mail_reply.ftl
rename to src/main/resources/templates/common/mail_template/mail_reply.ftl
diff --git a/src/main/resources/templates/themes/anatole/gallery.ftl b/src/main/resources/templates/themes/anatole/gallery.ftl
index bc91724d7..0b6540cc0 100644
--- a/src/main/resources/templates/themes/anatole/gallery.ftl
+++ b/src/main/resources/templates/themes/anatole/gallery.ftl
@@ -1,3 +1,4 @@
+<#include "../../common/macro/common_macro.ftl">
 <!DOCTYPE HTML>
 <html>
 <head>
@@ -41,6 +42,6 @@
 <script src="anatole/source/plugins/gallery/js/jquery.min.js"></script>
 <script src="anatole/source/plugins/gallery/js/skel.min.js"></script>
 <script src="anatole/source/plugins/gallery/js/main.js"></script>
-${options.statistics_code?if_exists}
+<@statistics></@statistics>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/themes/anatole/module/macro.ftl b/src/main/resources/templates/themes/anatole/module/macro.ftl
index 0b74e0a3c..d61ce5e7b 100644
--- a/src/main/resources/templates/themes/anatole/module/macro.ftl
+++ b/src/main/resources/templates/themes/anatole/module/macro.ftl
@@ -1,3 +1,4 @@
+<#include "../../../common/macro/common_macro.ftl">
 <#macro head title="" keywords="" description="">
 <!DOCTYPE html>
 <html>
@@ -13,7 +14,7 @@
     <meta name="author" content="${user.userDisplayName?if_exists}" />
     <meta name="keywords" content="${keywords?default("Anatole")}"/>
     <meta name="description" content="${description?default("Anatole")}" />
-    <link rel="shortcut icon" href="${options.anatole_style_favicon?default("/anatole/source/images/favicon.png")}" type="image/x-icon" />
+    <@favicon></@favicon>
     <link href="/anatole/source/css/font-awesome.min.css" type="text/css" rel="stylesheet"/>
     <link rel="stylesheet" href="/anatole/source/css/blog_basic.min.css?version=88107691fe">
     <link href="/anatole/source/css/style.min.css" type="text/css" rel="stylesheet" />
@@ -75,7 +76,7 @@
 	  xhr.send();
     </#if>
 </script>
-${options.statistics_code?if_exists}
+<@statistics></@statistics>
 </body>
 </html>
 </#macro>
diff --git a/src/main/resources/templates/themes/anatole/module/options.ftl b/src/main/resources/templates/themes/anatole/module/options.ftl
index 784471f95..8351dfd78 100644
--- a/src/main/resources/templates/themes/anatole/module/options.ftl
+++ b/src/main/resources/templates/themes/anatole/module/options.ftl
@@ -116,17 +116,6 @@
                     <div class="tab-pane" id="style">
                         <form method="post" class="form-horizontal" id="anatoleStyleOptions">
                             <div class="box-body">
-                                <div class="form-group">
-                                    <label for="anatoleStyleFavicon" class="col-sm-4 control-label">Favicon：</label>
-                                    <div class="col-sm-8">
-                                        <div class="input-group">
-                                            <input type="text" class="form-control" id="anatoleStyleFavicon" name="anatole_style_favicon" value="${options.anatole_style_favicon?default("/anatole/source/images/favicon.png")}" >
-                                            <span class="input-group-btn">
-                                                <button class="btn btn-default btn-flat" type="button" onclick="openAttach('anatoleStyleFavicon')">选择</button>
-                                            </span>
-                                        </div>
-                                    </div>
-                                </div>
                                 <div class="form-group">
                                     <label for="anatoleStyleRightIcon" class="col-sm-4 control-label">右上角图标：</label>
                                     <div class="col-sm-8">
diff --git a/src/main/resources/templates/themes/anatole/module/sidebar.ftl b/src/main/resources/templates/themes/anatole/module/sidebar.ftl
index 659092d33..7f4f22d60 100644
--- a/src/main/resources/templates/themes/anatole/module/sidebar.ftl
+++ b/src/main/resources/templates/themes/anatole/module/sidebar.ftl
@@ -23,8 +23,8 @@
                 <a href="https://github.com/ruibaby/halo" target="_blank">Proudly published with Halo&#65281;</a>
             </div>
             <div class="footer_text">
-                ${options.blog_footer_info?if_exists}
+                <@footer_info></@footer_info>
             </div>
         </a>
     </div>
-</div>
\ No newline at end of file
+</div>