diff --git a/build/Gruntfile.js b/build/Gruntfile.js
index a99ebc3cb..2deb12dea 100644
--- a/build/Gruntfile.js
+++ b/build/Gruntfile.js
@@ -245,7 +245,33 @@ module.exports = function(grunt) {
             }
         }
     });
-    doRegisterTask('apps-common');
+    doRegisterTask('apps-common', (defaultConfig, packageFile) => {
+        return {
+            imagemin: {
+                options: {
+                    optimizationLevel: 3
+                },
+                dynamic: {
+                    files: packageFile['apps-common']['imagemin']['images-common']
+                }
+            },
+            svgmin: {
+                options: {
+                    plugins: [{
+                        cleanupIDs: false
+                    },
+                    {
+                        convertPathData: {
+                            floatPrecision: 4
+                        }
+                    }]
+                },
+                dist: {
+                    files: packageFile['apps-common'].svgicons.common
+                }
+            },
+        }
+    });
     doRegisterTask('sockjs');
     doRegisterTask('xregexp');
     doRegisterTask('megapixel');
@@ -614,7 +640,7 @@ module.exports = function(grunt) {
     var copyTask = grunt.option('desktop')? "copy": "copy:script";
 
     grunt.registerTask('deploy-api',                    ['api-init', 'clean', copyTask, 'replace:writeVersion']);
-    grunt.registerTask('deploy-apps-common',            ['apps-common-init', 'clean', 'copy']);
+    grunt.registerTask('deploy-apps-common',            ['apps-common-init', 'clean', 'copy', 'imagemin', 'svgmin']);
     grunt.registerTask('deploy-sdk',                    ['sdk-init', 'clean', copyTask]);
 
     grunt.registerTask('deploy-sockjs',                 ['sockjs-init', 'clean', 'copy']);
diff --git a/build/common.json b/build/common.json
index ac73a304a..5861cf114 100644
--- a/build/common.json
+++ b/build/common.json
@@ -90,6 +90,29 @@
                 "src": "*.json",
                 "dest": "../deploy/web-apps/apps/common/main/resources/alphabetletters"
             }
+        },
+        "imagemin": {
+            "images-common": [
+                {
+                    "expand": true,
+                    "cwd": "../apps/common/main/resources/img/",
+                    "src": [
+                        "**/*.{png,jpg,gif}",
+                        "!toolbar/*x/**/*"
+                    ],
+                    "dest": "../deploy/web-apps/apps/common/main/resources/img/"
+                }
+            ]
+        },
+        "svgicons": {
+            "common": [
+                {
+                    "expand": true,
+                    "cwd": "../apps/common/main/resources/img",
+                    "src": "**/*_s.svg",
+                    "dest": "../deploy/web-apps/apps/common/main/resources/img"
+                }
+            ]
         }
     },
     "bootstrap": {