diff --git a/package.json b/package.json
index 24ac829e..08ecad64 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,6 @@
     "skinview3d": "^1.1.0-alpha.4",
     "sweetalert2": "^7.26.9",
     "toastr": "^2.1.4",
-    "typeface-minecraft": "^1.0.0",
-    "typeface-ubuntu": "^0.0.54",
     "vue": "^2.5.16",
     "vuejs-paginate": "^2.0.1"
   },
diff --git a/resources/assets/src/fonts/minecraft.woff b/resources/assets/src/fonts/minecraft.woff
new file mode 100644
index 00000000..8009c272
Binary files /dev/null and b/resources/assets/src/fonts/minecraft.woff differ
diff --git a/resources/assets/src/fonts/minecraft.woff2 b/resources/assets/src/fonts/minecraft.woff2
new file mode 100644
index 00000000..6db88bb8
Binary files /dev/null and b/resources/assets/src/fonts/minecraft.woff2 differ
diff --git a/resources/assets/src/fonts/ubuntu.woff b/resources/assets/src/fonts/ubuntu.woff
new file mode 100644
index 00000000..c2cc479d
Binary files /dev/null and b/resources/assets/src/fonts/ubuntu.woff differ
diff --git a/resources/assets/src/fonts/ubuntu.woff2 b/resources/assets/src/fonts/ubuntu.woff2
new file mode 100644
index 00000000..171099bf
Binary files /dev/null and b/resources/assets/src/fonts/ubuntu.woff2 differ
diff --git a/resources/assets/src/stylus/common.styl b/resources/assets/src/stylus/common.styl
index b20802b0..f40e9c56 100644
--- a/resources/assets/src/stylus/common.styl
+++ b/resources/assets/src/stylus/common.styl
@@ -1,5 +1,17 @@
 font_stack = Ubuntu, 'Segoe UI', 'Microsoft Yahei', 'Microsoft Jhenghei', sans-serif;
 
+@font-face {
+    font-family: 'Ubuntu';
+    src: url('../fonts/ubuntu.woff2') format('woff2'),
+         url('../fonts/ubuntu.woff') format('woff');
+}
+
+@font-face {
+    font-family: 'Minecraft';
+    src: url('../fonts/minecraft.woff2')  format('woff2'),
+         url('../fonts/minecraft.woff')   format('woff');
+}
+
 body, h1, h2, h3, h4, h5, h6, .logo {
     font-family: font_stack;
 }
diff --git a/webpack.config.js b/webpack.config.js
index 3a9a66e6..6abc3259 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -18,8 +18,6 @@ module.exports = [{
             'font-awesome/css/font-awesome.min.css',
             'icheck/skins/square/blue.css',
             'toastr/build/toastr.min.css',
-            'typeface-ubuntu',
-            'typeface-minecraft',
             './resources/assets/src/stylus/common.styl',
         ]
     },
@@ -71,11 +69,15 @@ module.exports = [{
                 ]
             },
             {
-                test: /\.(png|jpg|gif|svg|woff2?|eot|ttf)$/,
+                test: /\.(png|jpg|gif)$/,
                 loader: 'url-loader',
                 options: {
                     limit: 8192
                 }
+            },
+            {
+                test: /\.(svg|woff2?|eot|ttf)$/,
+                loader: 'file-loader'
             }
         ],
         noParse: /^(vue|jquery)$/
diff --git a/yarn.lock b/yarn.lock
index 8c3c177f..972ff679 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7263,14 +7263,6 @@ typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-typeface-minecraft@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/typeface-minecraft/-/typeface-minecraft-1.0.0.tgz#1624627ed15eff5fb7e70f19807097a5b13ce1c3"
-
-typeface-ubuntu@^0.0.54:
-  version "0.0.54"
-  resolved "https://registry.yarnpkg.com/typeface-ubuntu/-/typeface-ubuntu-0.0.54.tgz#1219d28be0a86b9a2d779e53d8b89d13de911ac3"
-
 uglify-es@^3.3.4, "uglify-es@npm:terser":
   version "3.8.1"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.1.tgz#cb70070ac9e0a71add169dfb63c0a64fca2738ac"