diff --git a/app/helpers.php b/app/helpers.php
index 9be74683..3c7b3546 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -153,7 +153,7 @@ if (! function_exists('bs_favicon')) {
     function bs_favicon()
     {
         // Fallback to default favicon
-        $url = Str::startsWith($url = (option('favicon_url') ?: config('options.favicon_url')), 'http') ? $url : assets($url);
+        $url = Str::startsWith($url = (option('favicon_url') ?: config('options.favicon_url')), 'http') ? $url : url($url);
 
         return <<< ICONS
 <link rel="shortcut icon" href="$url">
diff --git a/config/options.php b/config/options.php
index afa7cdf7..436201a7 100644
--- a/config/options.php
+++ b/config/options.php
@@ -12,7 +12,7 @@ return [
     'api_type'                  => 'false',
     'announcement'              => 'Welcome to Blessing Skin {version}!',
     'color_scheme'              => 'skin-blue',
-    'home_pic_url'              => './resources/assets/dist/images/bg.jpg',
+    'home_pic_url'              => './public/bg.jpg',
     'custom_css'                => '',
     'custom_js'                 => '',
     'player_name_rule'          => 'official',
@@ -42,5 +42,5 @@ return [
     'plugins_enabled'           => '',
     'copyright_prefer'          => '0',
     'score_per_closet_item'     => '0',
-    'favicon_url'               => 'dist/images/favicon.ico'
+    'favicon_url'               => 'public/favicon.ico'
 ];
diff --git a/resources/assets/dist/.gitignore b/resources/assets/dist/.gitignore
deleted file mode 100644
index d6b7ef32..00000000
--- a/resources/assets/dist/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/resources/assets/src/stylus/install.styl b/resources/assets/src/stylus/setup.styl
similarity index 99%
rename from resources/assets/src/stylus/install.styl
rename to resources/assets/src/stylus/setup.styl
index 1e09ecbe..ea7cd2de 100644
--- a/resources/assets/src/stylus/install.styl
+++ b/resources/assets/src/stylus/setup.styl
@@ -1,4 +1,4 @@
-@import "general.styl";
+@import "common.styl";
 
 html {
     background: #f1f1f1;
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index f3b1de2e..c272d8c8 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -126,7 +126,45 @@
     <!-- App Scripts -->
     @include('common.dependencies.script')
 
-    <script type="text/javascript">
+    <script>
+        function isMobileBrowserScrolling() {
+            var currentWindowWidth  = $(window).width();
+            var currentWindowHeight = $(window).height();
+
+            if ($.cachedWindowWidth === undefined) {
+                $.cachedWindowWidth = currentWindowWidth;
+            }
+
+            if ($.cachedWindowHeight === undefined) {
+                $.cachedWindowHeight = currentWindowHeight;
+            }
+
+            var isWidthChanged  = (currentWindowWidth  !== $.cachedWindowWidth);
+            var isHeightChanged = (currentWindowHeight !== $.cachedWindowHeight);
+
+            // If the window width & height changes simultaneously, the resize can't be fired by scrolling.
+            if (isWidthChanged && isHeightChanged) {
+                return false;
+            }
+
+            // If only width was changed, it also can't be.
+            if (isWidthChanged) {
+                return false;
+            }
+
+            // If width didn't change but height changed ?
+            if (isHeightChanged) {
+                var last = $.lastWindowHeight;
+                $.lastWindowHeight = currentWindowHeight;
+
+                if (last === undefined || currentWindowHeight === last) {
+                    return true;
+                }
+            }
+
+            // If both width & height did not change
+            return false;
+        }
 
         function changeWrapperHeight() {
             var btn = $('p a.button');
diff --git a/resources/views/setup/master.blade.php b/resources/views/setup/master.blade.php
index 4b9b5664..801d5997 100644
--- a/resources/views/setup/master.blade.php
+++ b/resources/views/setup/master.blade.php
@@ -6,7 +6,7 @@
     <meta name="robots" content="noindex,nofollow" />
     <title>@lang('setup.wizard.master.title')</title>
     <link rel="shortcut icon" href="{{ assets('dist/images/favicon.ico') }}">
-    <link rel="stylesheet" type="text/css" href="{{ assets('dist/css/install.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ webpack_assets('setup.css') }}">
     @yield('style')
 </head>
 
diff --git a/webpack.config.js b/webpack.config.js
index ff8b593e..352ca916 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -25,6 +25,7 @@ const config = {
             './resources/assets/src/stylus/common.styl',
         ],
         home: './resources/assets/src/stylus/home.styl',
+        setup: './resources/assets/src/stylus/setup.styl',
         'langs/en': './resources/lang/en/front-end.js',
         'langs/zh_CN': './resources/lang/zh_CN/front-end.js',
     },
@@ -71,7 +72,7 @@ const config = {
                 ]
             },
             {
-                test: /(common|home)\.styl$/,
+                test: /(common|home|setup)\.styl$/,
                 use: [
                     MiniCssExtractPlugin.loader,
                     { loader: 'css-loader', options: { importLoaders: 3 } },
@@ -119,6 +120,8 @@ const config = {
                 flatten: true
             },
             'node_modules/chart.js/dist/Chart.min.js',
+            'resources/assets/src/images/bg.jpg',
+            'resources/assets/src/images/favicon.ico',
         ]),
         new BundleAnalyzerPlugin({
             openAnalyzer: false,