diff --git a/superset-frontend/src/assets/staticPages/404.html b/superset-frontend/src/assets/staticPages/404.html
new file mode 100644
index 000000000..2b20e3d71
--- /dev/null
+++ b/superset-frontend/src/assets/staticPages/404.html
@@ -0,0 +1,109 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=q, initial-scale=1.0" />
+    <link
+      rel="icon"
+      type="image/png"
+      href="<%= require('../../../images/favicon.png')%>"
+    />
+    <link rel="preconnect" href="https://fonts.gstatic.com" />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap"
+      rel="stylesheet"
+    />
+    <style>
+      html {
+        height: 100%;
+      }
+      body {
+        color: #1985a0;
+        font-family: 'Inter', sans-serif;
+        height: 100%;
+        margin: 0;
+        display: flex;
+        align-items: stretch;
+      }
+      h1 {
+        font-weight: 600;
+        font-size: 88px;
+        margin: 0;
+      }
+      p {
+        font-weight: 500;
+        font-size: 24px;
+        line-height: 40px;
+        width: 490px;
+      }
+      .button {
+        -webkit-appearance: button;
+        -moz-appearance: button;
+        appearance: button;
+        background-color: #1985a0; /* Green */
+        border: none;
+        color: white;
+        padding: 16px 38px;
+        text-align: center;
+        text-decoration: none;
+        display: inline-block;
+        font-size: 11px;
+        border-radius: 4px;
+        text-transform: uppercase;
+      }
+      .error-page-content {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        max-width: 1350px;
+        margin: auto;
+        width: 100%;
+        padding: 56px;
+      }
+      img {
+        width: 540px;
+      }
+    </style>
+
+    <title>404: Not found | Superset</title>
+  </head>
+
+  <body>
+    <div class="error-page-content">
+      <section>
+        <h1>Page not found</h1>
+        <p>
+          Sorry, we cannot find t he page you are looking for. You may have
+          mistyped the address or the page may have moved.
+        </p>
+        <a href="/" class="button">Back to home</a>
+      </section>
+      <img
+        alt="404"
+        src="<%= require('../../../images/error404.png')%>"
+        width="540"
+      />
+    </div>
+  </body>
+</html>
diff --git a/superset-frontend/src/assets/staticPages/500.html b/superset-frontend/src/assets/staticPages/500.html
new file mode 100644
index 000000000..3808df3d5
--- /dev/null
+++ b/superset-frontend/src/assets/staticPages/500.html
@@ -0,0 +1,108 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=q, initial-scale=1.0" />
+    <link
+      rel="icon"
+      type="image/png"
+      href="<%= require('../../../images/favicon.png')%>"
+    />
+    <link
+      href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap"
+      rel="stylesheet"
+    />
+    <style>
+      html {
+        height: 100%;
+      }
+      body {
+        color: #1985a0;
+        font-family: 'Inter', sans-serif;
+        height: 100%;
+        margin: 0;
+        display: flex;
+        align-items: stretch;
+      }
+      h1 {
+        font-weight: 600;
+        font-size: 88px;
+        margin: 0;
+      }
+      p {
+        font-weight: 500;
+        font-size: 24px;
+        line-height: 40px;
+        width: 490px;
+      }
+      .button {
+        -webkit-appearance: button;
+        -moz-appearance: button;
+        appearance: button;
+        background-color: #1985a0; /* Green */
+        border: none;
+        color: white;
+        padding: 16px 38px;
+        text-align: center;
+        text-decoration: none;
+        display: inline-block;
+        font-size: 11px;
+        border-radius: 4px;
+        text-transform: uppercase;
+      }
+      .error-page-content {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        max-width: 1350px;
+        margin: auto;
+        width: 100%;
+        padding: 56px;
+      }
+      img {
+        width: 540px;
+      }
+    </style>
+
+    <title>500: Internal server error | S uperset</title>
+  </head>
+
+  <body>
+    <div class="error-page-content">
+      <section>
+        <h1>Internal server error</h1>
+        <p>
+          Sorry, something went wrong. We are fixing the mistake now. Try again
+          later or go back to home.
+        </p>
+        <a href="/" class="button">Back to home</a>
+      </section>
+      <img
+        alt="500"
+        src="<%= require('../../../images/error500.png')%>"
+        width="540"
+      />
+    </div>
+  </body>
+</html>
diff --git a/superset-frontend/src/staticPages/404.html b/superset-frontend/src/staticPages/404.html
deleted file mode 100644
index 67055efdb..000000000
--- a/superset-frontend/src/staticPages/404.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=q, initial-scale=1.0">
-        <link rel="icon" type="image/png" href="<%= require('../../images/favicon.png')%>">
-        <link rel="preconnect" href="https://fonts.gstatic.com">
-        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap" rel="stylesheet">
-        <style>
-            html { height: 100%; }
-            body {
-                color: #1985A0;
-                font-family: 'Inter', sans-serif;
-                height: 100%;
-                margin: 0;
-                display: flex;
-                align-items:stretch;
-            }
-            h1 {
-                font-weight: 600;
-                font-size: 88px;
-                margin: 0;
-            }
-            p {
-                font-weight: 500;
-                font-size: 24px;
-                line-height: 40px;
-                width: 490px;
-            }
-            .button {
-                -webkit-appearance: button;
-                -moz-appearance: button;
-                appearance: button;
-                background-color: #1985A0; /* Green */
-                border: none;
-                color: white;
-                padding: 16px 38px;
-                text-align: center;
-                text-decoration: none;
-                display: inline-block;
-                font-size: 11px;
-                border-radius: 4px;
-                text-transform: uppercase;
-            }
-            .error-page-content {
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-                justify-content: space-between;
-                max-width: 1350px;
-                margin: auto;
-                width: 100%;
-                padding: 56px;
-            }
-            img {
-                width: 540px;
-            }
-        </style>
-
-        <title>404: Not found | Superset</title>
-    </head>
-
-    <body>
-        <div class="error-page-content">
-            <section>
-                <h1>Page not found</h1>
-                <p>Sorry, we cannot find t he page you are looking for. You may have mistyped the address or the page may have moved.</p>
-                <a href="/" class="button">Back to home</a>
-            </section>
-            <img alt="404"  src="<%= require('../../images/error404.png')%>" width="540">
-        </div>
-    </body>
-</html>
diff --git a/superset-frontend/src/staticPages/500.html b/superset-frontend/src/staticPages/500.html
deleted file mode 100644
index af764334f..000000000
--- a/superset-frontend/src/staticPages/500.html
+++ /dev/null
@@ -1,92 +0,0 @@
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-        <meta name="viewport" content="width=q, initial-scale=1.0">
-        <link rel="icon" type="image/png" href="<%= require('../../images/favicon.png')%>">
-        <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500&display=swap" rel="stylesheet">
-        <style>
-            html { height: 100%; }
-            body {
-                color: #1985A0;
-                font-family: 'Inter', sans-serif;
-                height: 100%;
-                margin: 0;
-                display: flex;
-                align-items:stretch;
-            }
-            h1 {
-                font-weight: 600;
-                font-size: 88px;
-                margin: 0;
-            }
-            p {
-                font-weight: 500;
-                font-size: 24px;
-                line-height: 40px;
-                width: 490px;
-            }
-            .button {
-                -webkit-appearance: button;
-                -moz-appearance: button;
-                appearance: button;
-                background-color: #1985A0; /* Green */
-                border: none;
-                color: white;
-                padding: 16px 38px;
-                text-align: center;
-                text-decoration: none;
-                display: inline-block;
-                font-size: 11px;
-                border-radius: 4px;
-                text-transform: uppercase;
-            }
-            .error-page-content {
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-                justify-content: space-between;
-                max-width: 1350px;
-                margin: auto;
-                width: 100%;
-                padding: 56px;
-            }
-            img {
-                width: 540px;
-            }
-        </style>
-
-        <title>500: Internal server error | S uperset</title>
-    </head>
-
-    <body>
-        <div class="error-page-content">
-            <section>
-                <h1>Internal server error</h1>
-                <p>Sorry, something went wrong. We are fixing the mistake now. Try again later or go back to home.</p>
-                <a href="/" class="button">Back to home</a>
-            </section>
-            <img alt="500" src="<%= require('../../images/error500.png')%>" width="540">
-        </div>
-    </body>
-</html>
diff --git a/superset-frontend/webpack.config.js b/superset-frontend/webpack.config.js
index b43b5dd74..a43d90a7e 100644
--- a/superset-frontend/webpack.config.js
+++ b/superset-frontend/webpack.config.js
@@ -123,13 +123,13 @@ const plugins = [
 
   // static pages
   new HtmlWebpackPlugin({
-    template: './src/staticPages/404.html',
+    template: './src/assets/staticPages/404.html',
     inject: true,
     chunks: [],
     filename: '404.html',
   }),
   new HtmlWebpackPlugin({
-    template: './src/staticPages/500.html',
+    template: './src/assets/staticPages/500.html',
     inject: true,
     chunks: [],
     filename: '500.html',
@@ -391,7 +391,7 @@ const config = {
       {
         test: /\.png$/,
         issuer: {
-          exclude: /\/src\/staticPages\//,
+          exclude: /\/src\/assets\/staticPages\//,
         },
         loader: 'url-loader',
         options: {
@@ -402,7 +402,7 @@ const config = {
       {
         test: /\.png$/,
         issuer: {
-          test: /\/src\/staticPages\//,
+          test: /\/src\/assets\/staticPages\//,
         },
         loader: 'url-loader',
         options: {
