diff --git a/Gruntfile.js b/Gruntfile.js
index b5c66473..16b158e8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -72,7 +72,7 @@ module.exports = function (grunt) {
       dist: 'dist',
       'dist-js': 'dist/js',
       'docs-dist-js': 'docs/dist/js',
-      docs: 'docs/dist'
+      'docs-dist-css': 'docs/dist/css',
     },
 
     eslint: {
@@ -186,7 +186,7 @@ module.exports = function (grunt) {
             autoprefixer
           ]
         },
-        src: 'docs/assets/css/*.css'
+        src: 'docs/dist/css/*.css'
       },
       examples: {
         options: {
@@ -222,8 +222,15 @@ module.exports = function (grunt) {
         ]
       },
       docs: {
-        src: 'docs/assets/css/docs.css',
-        dest: 'docs/assets/css/docs.min.css'
+        files: [
+          {
+            expand: true,
+            cwd: 'docs/dist/css',
+            src: ['*.css', '!*.min.css'],
+            dest: 'docs/dist/css',
+            ext: '.min.css'
+          }
+        ]
       }
     },
 
@@ -244,8 +251,8 @@ module.exports = function (grunt) {
         dest: 'docs/examples/'
       },
       docs: {
-        src: 'docs/assets/css/src/docs.css',
-        dest: 'docs/assets/css/src/docs.css'
+        src: 'docs/dist/css/docs.css',
+        dest: 'docs/dist/css/docs.css'
       }
     },
 
@@ -562,9 +569,17 @@ module.exports = function (grunt) {
     'copy:bs-docs-examples',
     'copy:bs-docs-plugins'
   ]);
-  grunt.registerTask('docs-css', ['sass:docs', 'postcss:docs', 'postcss:examples', 'csscomb:docs', 'csscomb:examples', 'cssmin:docs']);
+  grunt.registerTask('docs-css', [
+    'clean:docs-dist-css',
+    'sass:docs',
+    'postcss:docs',
+    'postcss:examples',
+    'csscomb:docs',
+    'csscomb:examples',
+    'cssmin:docs'
+  ]);
 
-  grunt.registerTask('docs', ['clean:docs', 'docs-css', 'docs-js']);
+  grunt.registerTask('docs', ['docs-css', 'docs-js']);
   //------
 
   //------
diff --git a/docs/_includes/header.html b/docs/_includes/header.html
index f1cbd52e..9053c1f5 100644
--- a/docs/_includes/header.html
+++ b/docs/_includes/header.html
@@ -19,9 +19,9 @@
 
 <!-- Material Design for Bootstrap customization for Documentation (consider Documentation the application) -->
 {% if site.data.minified %}
-<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/dist/css/docs.min.css" rel="stylesheet">
 {% else %}
-<link href="{{ site.baseurl }}/assets/css/docs.css" rel="stylesheet">
+<link href="{{ site.baseurl }}/dist/css/docs.css" rel="stylesheet">
 {% endif %}
 
 
diff --git a/grunt/bs-sass-compile/libsass.js b/grunt/bs-sass-compile/libsass.js
index c2e47229..1d39a975 100644
--- a/grunt/bs-sass-compile/libsass.js
+++ b/grunt/bs-sass-compile/libsass.js
@@ -25,7 +25,7 @@ module.exports = function configureLibsass(grunt) {
       },
       docs: {
         files: {
-          'docs/assets/css/docs.css': 'docs/assets/scss/docs.scss'
+          'docs/dist/css/docs.css': 'docs/assets/scss/docs.scss'
         }
       }
     }
diff --git a/grunt/bs-sass-compile/sass.js b/grunt/bs-sass-compile/sass.js
index 77006af1..2e4a39a4 100644
--- a/grunt/bs-sass-compile/sass.js
+++ b/grunt/bs-sass-compile/sass.js
@@ -29,7 +29,7 @@ module.exports = function configureRubySass(grunt) {
       docs: {
         options: options,
         files: {
-          'docs/assets/css/docs.css': 'docs/assets/scss/docs.scss'
+          'docs/dist/css/docs.css': 'docs/assets/scss/docs.scss'
         }
       }
     }