diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php
index a0e34e83d..f6ef850af 100644
--- a/resources/views/errors/404.blade.php
+++ b/resources/views/errors/404.blade.php
@@ -1,30 +1,40 @@
-@extends('base')
+@extends('simple-layout')
 
 @section('content')
 
 
 <div class="container">
 
+    <p>&nbsp;</p>
 
-    <h1>{{ $message or trans('errors.404_page_not_found') }}</h1>
-    <p>{{ trans('errors.sorry_page_not_found') }}</p>
-    <p><a href="{{ baseUrl('/') }}" class="button">{{ trans('errors.return_home') }}</a></p>
+    <div class="card">
+        <h3><i class="zmdi zmdi-alert-octagon"></i> {{ $message or trans('errors.404_page_not_found') }}</h3>
+        <div class="body">
+            <h5>{{ trans('errors.sorry_page_not_found') }}</h5>
+            <p><a href="{{ baseUrl('/') }}" class="button outline">{{ trans('errors.return_home') }}</a></p>
+        </div>
+    </div>
 
     @if (setting('app-public') || !user()->isDefault())
-        <hr>
 
         <div class="row">
             <div class="col-md-4">
-                <h3 class="text-muted">{{ trans('entities.pages_popular') }}</h3>
-                @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Page::class]), 'style' => 'compact'])
+                <div class="card">
+                    <h3 class="text-muted"><i class="zmdi zmdi-file-text"></i> {{ trans('entities.pages_popular') }}</h3>
+                    @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Page::class]), 'style' => 'compact'])
+                </div>
             </div>
             <div class="col-md-4">
-                <h3 class="text-muted">{{ trans('entities.books_popular') }}</h3>
-                @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Book::class]), 'style' => 'compact'])
+                <div class="card">
+                    <h3 class="text-muted"><i class="zmdi zmdi-book"></i> {{ trans('entities.books_popular') }}</h3>
+                    @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Book::class]), 'style' => 'compact'])
+                </div>
             </div>
             <div class="col-md-4">
-                <h3 class="text-muted">{{ trans('entities.chapters_popular') }}</h3>
-                @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Chapter::class]), 'style' => 'compact'])
+                <div class="card">
+                    <h3 class="text-muted"><i class="zmdi zmdi-collection-bookmark"></i> {{ trans('entities.chapters_popular') }}</h3>
+                    @include('partials.entity-list', ['entities' => Views::getPopular(10, 0, [\BookStack\Chapter::class]), 'style' => 'compact'])
+                </div>
             </div>
         </div>
     @endif
diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php
index 6dd96cdcc..71fb78a35 100644
--- a/resources/views/errors/500.blade.php
+++ b/resources/views/errors/500.blade.php
@@ -3,8 +3,13 @@
 @section('content')
 
     <div class="container">
-        <h1 class="text-muted">{{ trans('errors.error_occurred') }}</h1>
-        <p>{{ $message }}</p>
+        <div class="card">
+            <h3 class="text-muted">{{ trans('errors.error_occurred') }}</h3>
+            <div class="body">
+                <h5>{{ $message }}</h5>
+                <p><a href="{{ baseUrl('/') }}" class="button outline">{{ trans('errors.return_home') }}</a></p>
+            </div>
+        </div>
     </div>
 
 @stop
\ No newline at end of file
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index 1ea39a7b8..98670df8a 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -2,9 +2,13 @@
 
 @section('content')
 
-    <div class="container">
-        <h1 class="text-muted">{{ trans('errors.app_down', ['appName' => setting('app-name')]) }}</h1>
-        <p>{{ trans('errors.back_soon') }}</p>
+    <div class="container small">
+        <div class="card">
+            <div class="body">
+                <h4 class="text-muted"><i class="zmdi zmdi-alert-octagon"></i> {{ trans('errors.app_down', ['appName' => setting('app-name')]) }}</h4>
+                <p>{{ trans('errors.back_soon') }}</p>
+            </div>
+        </div>
     </div>
 
 @stop
\ No newline at end of file