diff --git a/client/client-app.js b/client/client-app.js
index cffe3d8f..1f3bda40 100644
--- a/client/client-app.js
+++ b/client/client-app.js
@@ -159,6 +159,7 @@ Vue.component('login', () => import(/* webpackPrefetch: true, webpackChunkName:
 Vue.component('nav-header', () => import(/* webpackMode: "eager" */ './components/common/nav-header.vue'))
 Vue.component('new-page', () => import(/* webpackChunkName: "new-page" */ './components/new-page.vue'))
 Vue.component('notify', () => import(/* webpackMode: "eager" */ './components/common/notify.vue'))
+Vue.component('not-found', () => import(/* webpackChunkName: "not-found" */ './components/not-found.vue'))
 Vue.component('page-selector', () => import(/* webpackPrefetch: true, webpackChunkName: "ui-extra" */ './components/common/page-selector.vue'))
 Vue.component('profile', () => import(/* webpackChunkName: "profile" */ './components/profile.vue'))
 Vue.component('register', () => import(/* webpackChunkName: "register" */ './components/register.vue'))
diff --git a/client/components/not-found.vue b/client/components/not-found.vue
new file mode 100644
index 00000000..7b749674
--- /dev/null
+++ b/client/components/not-found.vue
@@ -0,0 +1,24 @@
+<template lang='pug'>
+  v-app
+    .notfound
+      .notfound-content
+        img.animated.fadeIn(src='/svg/icon-delete-file.svg', alt='Not Found')
+        .headline {{$t('notfound.title')}}
+        .subheading.mt-3 {{$t('notfound.subtitle')}}
+        v-btn.mt-5(color='red lighten-4', href='/', large, outlined)
+          v-icon(left) mdi-home
+          span {{$t('notfound.gohome')}}
+</template>
+
+<script>
+
+export default {
+  data() {
+    return { }
+  }
+}
+</script>
+
+<style lang='scss'>
+
+</style>
diff --git a/client/components/setup.vue b/client/components/setup.vue
index 9bb40c58..1a0b2f0b 100644
--- a/client/components/setup.vue
+++ b/client/components/setup.vue
@@ -73,7 +73,7 @@
                   persistent-hint,
                   hint='Help Wiki.js developers improve this app with anonymized telemetry.'
                 )
-              v-alert(:value='error', type='error', icon='warning') {{ errorMessage }}
+              v-alert(:value='error', type='error', icon='mdi-alert') {{ errorMessage }}
               v-divider.mt-3(v-if='!error')
               v-card-actions
                 v-btn(color='primary', @click='install', :disabled='loading', x-large, flat, block)
diff --git a/server/views/notfound.pug b/server/views/notfound.pug
index 0674b9ee..d0d5d66e 100644
--- a/server/views/notfound.pug
+++ b/server/views/notfound.pug
@@ -2,12 +2,4 @@ extends master.pug
 
 block body
   #root.is-fullscreen
-    v-app
-      .notfound
-        .notfound-content
-          img.animated.fadeIn(src='/svg/icon-delete-file.svg', alt='Not Found')
-          .headline= t('notfound.title')
-          .subheading.mt-3= t('notfound.subtitle')
-          v-btn.mt-5(color='red lighten-4', href='/', large, outline)
-            v-icon(left) home
-            span= t('notfound.gohome')
+    not-found