diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index c5ae200230..fd50df90da 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -313,10 +313,8 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('prebuild-icons-sprite', function() {
-        process.chdir('./sprites');
         require('./sprites/Gruntfile.js')(grunt, '../');
         grunt.task.run('all-icons-sprite');
-        process.chdir('../');
     });
 
     grunt.registerTask('main-app-init', function() {
diff --git a/build/package-lock.json b/build/package-lock.json
index 99e99211c1..3cdbba4900 100644
--- a/build/package-lock.json
+++ b/build/package-lock.json
@@ -22,6 +22,7 @@
         "grunt-inline": "file:plugins/grunt-inline",
         "grunt-json-minify": "^1.1.0",
         "grunt-spritesmith": "^6.9.0",
+        "grunt-svg-sprite": "^2.0.2",
         "grunt-svgmin": "^6.0.1",
         "grunt-terser": "^2.0.0",
         "grunt-text-replace": "0.4.0",
@@ -17080,6 +17081,27 @@
         "url2": "1.0.0"
       }
     },
+    "grunt-svg-sprite": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/grunt-svg-sprite/-/grunt-svg-sprite-2.0.2.tgz",
+      "integrity": "sha512-BByPBYNPzDASSO5mAD8aHnVXabyalC2lpxB9KKgkbWaTMoJ2nhjcCHJ8NSP9rGHoZhENvqazmu6Wxq3b8/9nZQ==",
+      "requires": {
+        "figures": "^3.2.0",
+        "picocolors": "^1.0.0",
+        "prettysize": "^2.0.0",
+        "svg-sprite": "^2.0.2"
+      },
+      "dependencies": {
+        "figures": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+          "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+          "requires": {
+            "escape-string-regexp": "^1.0.5"
+          }
+        }
+      }
+    },
     "grunt-svgmin": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/grunt-svgmin/-/grunt-svgmin-6.0.1.tgz",
diff --git a/build/package.json b/build/package.json
index 0a1e2c7b16..4069c09106 100644
--- a/build/package.json
+++ b/build/package.json
@@ -18,6 +18,7 @@
     "grunt-inline": "file:plugins/grunt-inline",
     "grunt-json-minify": "^1.1.0",
     "grunt-spritesmith": "^6.9.0",
+    "grunt-svg-sprite": "^2.0.2",
     "grunt-svgmin": "^6.0.1",
     "grunt-terser": "^2.0.0",
     "grunt-text-replace": "0.4.0",