diff --git a/build/build-modules-js/compilecss.es6.js b/build/build-modules-js/compilecss.es6.js
index b741ebe9a2b8b..76c4097283cf1 100644
--- a/build/build-modules-js/compilecss.es6.js
+++ b/build/build-modules-js/compilecss.es6.js
@@ -58,11 +58,12 @@ module.exports.compile = (options, path) => {
 
       // Loop to get the files that should be compiled via parameter
       folders.forEach((folder) => {
-        Recurs(folder, ['*.js', '*.map', '*.svg', '*.png', '*.swf', '*.json']).then(
+        Recurs(folder, ['*.js', '*.map', '*.svg', '*.png', '*.gif', '*.swf', '*.html', '*.json']).then(
           (filesRc) => {
             filesRc.forEach(
               (file) => {
-                if (file.match(/\.scss/) && file.charAt(0) !== '_') {
+                // Don't take files with "_" but "file" has the full path, so check via match
+                if (file.match(/\.scss$/) && !file.match(/(\/|\\)_[^/\\]+$/)) {
                   files.push(file);
                 }
                 if (file.match(/\.css/)) {
@@ -85,12 +86,18 @@ module.exports.compile = (options, path) => {
                 console.error(`something exploded ${error}`);
               },
             );
+
+            return files;
+          },
+        ).then(
+          (scssFiles) => {
+            scssFiles.forEach(
+              (inputFile) => {
+                CompileScss.compile(inputFile, options);
+              },
+            );
           },
         );
-
-        files.forEach((inputFile) => {
-          CompileScss.compile(inputFile, options);
-        });
       });
     })
 
diff --git a/build/build-modules-js/stylesheets/scss-transform.es6.js b/build/build-modules-js/stylesheets/scss-transform.es6.js
index 5834521252106..6369e216fa3e3 100644
--- a/build/build-modules-js/stylesheets/scss-transform.es6.js
+++ b/build/build-modules-js/stylesheets/scss-transform.es6.js
@@ -7,7 +7,9 @@ const Sass = require('node-sass');
 const MakeDir = require('../utils/make-dir.es6.js');
 
 module.exports.compile = (file, options) => {
-  const cssFile = file.replace('/scss/', '/css/').replace('.scss', '.css').replace('/build/media_source/', '/media/');
+  const cssFile = file.replace('/scss/', '/css/').replace('\\scss\\', '\\css\\')
+    .replace('.scss', '.css').replace('/build/media_source/', '/media/')
+    .replace('\\build\\media_source\\', '\\media\\');
 
   Sass.render({
     file,