diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs
new file mode 100644
index 0000000000..18e2ca482e
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveFoldersStep.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Linq;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+public class RemoveFoldersStep : ProjectBuildPipelineStep
+{
+    private readonly string _folderPath;
+
+    public RemoveFoldersStep(string folderPath)
+    {
+        _folderPath = folderPath;
+    }
+
+    public override void Execute(ProjectBuildContext context)
+    {
+        context.Files.RemoveAll(file => file.Name.Contains(_folderPath));
+    }
+}
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs
index ce61d9775f..124209d559 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs
@@ -19,7 +19,7 @@ public class TemplateCodeDeleteStep : ProjectBuildPipelineStep
                 file.Name.EndsWith(".ps1") ||
                 file.Name.EndsWith(".html") || 
                 file.Name.EndsWith(".ts") ||
-                file.Name.EndsWith(".scss"))
+                file.Name.EndsWith(".css"))
             {
                 file.RemoveTemplateCode(context.Symbols);
                 file.RemoveTemplateCodeMarkers();
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index 3cf1aadb5e..5fff1ebcdc 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -219,21 +219,12 @@ public abstract class AppTemplateBase : TemplateInfo
     {
         if (context.BuildArgs.Theme is not Theme.Lepton && IsPro())
         {
-            RemoveThemeFolders(folderPath: "/wwwroot/images/logo/lepton");
+            steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/lepton"));
         }
         
         if (context.BuildArgs.Theme is not Theme.LeptonX or Theme.LeptonXLite)
         {
-            RemoveThemeFolders(folderPath: "/wwwroot/images/logo/leptonx");
-        }
-
-        void RemoveThemeFolders(string folderPath)
-        {
-            var logoPaths = context.Files.Where(x => x.Name.Contains(folderPath) && x.IsDirectory);
-            foreach (var logoPath in logoPaths)
-            {
-                steps.Add(new RemoveFolderStep(logoPath.Name));
-            }
+            steps.Add(new RemoveFoldersStep("/wwwroot/images/logo/leptonx"));
         }
     }