diff --git a/src/optimize/base_optimizer.js b/src/optimize/base_optimizer.js
index 0e4d90904ae9..deb914cf6cbe 100644
--- a/src/optimize/base_optimizer.js
+++ b/src/optimize/base_optimizer.js
@@ -356,12 +356,11 @@ export default class BaseOptimizer {
             loader: 'raw-loader'
           },
           {
-            test: /\.(png|jpg|gif|jpeg)$/,
-            loader: ['url-loader'],
-          },
-          {
-            test: /\.(woff|woff2|ttf|eot|svg|ico)(\?|$)/,
-            loader: 'file-loader'
+            test: /\.(woff|woff2|ttf|eot|svg|ico|png|jpg|gif|jpeg)(\?|$)/,
+            loader: 'url-loader',
+            options: {
+              limit: 8192
+            }
           },
           {
             resource: createSourceFileResourceSelector(/\.js$/),