diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go
index 799aaa36c..ff2bb2501 100644
--- a/kernel/bazaar/icon.go
+++ b/kernel/bazaar/icon.go
@@ -96,9 +96,9 @@ func Icons() (icons []*Icon) {
 
 func InstalledIcons() (ret []*Icon) {
 	ret = []*Icon{}
-	dir, err := os.Open(filepath.Join(util.DataDir, "icons"))
+	dir, err := os.Open(filepath.Join(util.AppearancePath, "icons"))
 	if nil != err {
-		logging.LogWarnf("open icons folder [%s] failed: %s", util.ThemesPath, err)
+		logging.LogWarnf("open icons folder failed: %s", err)
 		return
 	}
 	iconDirs, err := dir.Readdir(-1)
diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go
index f43692fd9..0de1247d3 100644
--- a/kernel/bazaar/package.go
+++ b/kernel/bazaar/package.go
@@ -107,7 +107,7 @@ func IconJSON(iconDirName string) (ret map[string]interface{}, err error) {
 }
 
 func TemplateJSON(templateDirName string) (ret map[string]interface{}, err error) {
-	p := filepath.Join(util.DataDir, templateDirName, "template.json")
+	p := filepath.Join(util.DataDir, "templates", templateDirName, "template.json")
 	if !gulu.File.IsExist(p) {
 		err = os.ErrNotExist
 		return