diff --git a/scripts/resolve-absolute-scss-imports.js b/scripts/resolve-absolute-scss-imports.js
index e4e29365f1..5671d445f3 100644
--- a/scripts/resolve-absolute-scss-imports.js
+++ b/scripts/resolve-absolute-scss-imports.js
@@ -1,4 +1,5 @@
 const replace = require('replace-in-file');
+const path = require('path');
 const {
   projectRoot,
 } = require('../webpack/helpers');
@@ -10,9 +11,9 @@ const {
 
 
 const options = {
-  files: projectRoot('build') + '/**/*.scss',
-  from: /@import '~\//g,
-  to: `@import '${projectRoot('./')}/`,
+  files: path.join(projectRoot('build'), '**', '*.scss'),
+  from: /@import '~\/([^']+)/g,
+  to: `@import '${path.join(projectRoot('./'), '$1')}`,
 };
 
 try {
diff --git a/webpack/helpers.js b/webpack/helpers.js
index d8ea4d4b24..040887c70a 100644
--- a/webpack/helpers.js
+++ b/webpack/helpers.js
@@ -9,7 +9,6 @@ const projectRoot = (relativePath) => {
 const srcPath = projectRoot('src');
 
 const buildRoot = (relativePath, env) => {
-  console.log(env.aot);
   if (env.aot) {
     return path.resolve(projectRoot('./build'), relativePath);
   } else {
@@ -68,8 +67,8 @@ const themeReplaceOptions =
   {
     multiple: [
       {
-        search: '@import \'~/',
-        replace: '@import \'' + projectRoot('./') + '/',
+        search: '@import \'~/([^\']+)',
+        replace: '@import \'' + path.join(projectRoot('./'), '$1'),
         flags: 'g'
       }
     ]