diff --git a/core/client/app/controllers/error.js b/core/client/app/controllers/error.js
index d7a0e8ff69..bd0b116958 100644
--- a/core/client/app/controllers/error.js
+++ b/core/client/app/controllers/error.js
@@ -5,7 +5,7 @@ var ErrorController = Ember.Controller.extend({
     }),
     message: Ember.computed('content.statusText', function () {
         if (this.get('code') === 404) {
-            return 'No Ghost Found';
+            return 'Page not found';
         }
 
         return this.get('content.statusText') !== 'error' ? this.get('content.statusText') : 'Internal Server Error';
diff --git a/core/client/app/styles/layouts/error.css b/core/client/app/styles/layouts/error.css
index 1007aa22c9..18f20d2773 100644
--- a/core/client/app/styles/layouts/error.css
+++ b/core/client/app/styles/layouts/error.css
@@ -2,91 +2,65 @@
 /* ---------------------------------------------------------- */
 
 .error-content {
-    display: table;
-    margin: 0 auto;
-    padding: 0;
-    max-width: 530px;
-    height: 100%;
-}
-
-.error-content {
+    flex-grow: 1;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     user-select: text;
 }
 
-@media (max-width: 630px) {
-    .error-content {
-        max-width: 264px;
-        text-align: center;
-    }
-}
-
 .error-details {
-    display: table-cell;
-    vertical-align: middle;
+    display: flex;
+    align-items: center;
+    margin-bottom: 4rem;
 }
 
-.error-image {
-    display: inline-block;
-    width: 96px;
-    height: 150px;
-    vertical-align: middle;
+.error-ghost {
+    margin: 15px;
+    height: 115px;
 }
 
 @media (max-width: 630px) {
-    .error-image {
-        width: 72px;
-        height: 112px;
+    .error-ghost {
+        display: none;
     }
 }
 
-.error-image img {
-    width: 100%;
-    height: 100%;
-}
-
-.error-message {
-    position: relative;
-    top: -5px;
-    display: inline-block;
-    margin-left: 10px;
-    vertical-align: middle;
-}
-
 .error-code {
     margin: 0;
     color: #979797;
-    font-size: 7.8em;
+    font-size: 7.8rem;
     line-height: 0.9em;
 }
 
-@media (max-width: 630px) {
-    .error-code {
-        font-size: 5.8em;
-    }
-}
 
 .error-description {
     margin: 0;
     padding: 0;
     border: none;
     color: #979797;
-    font-size: 1.9em;
+    font-size: 1.9rem;
     font-weight: 300;
 }
 
-@media (max-width: 630px) {
-    .error-description {
-        font-size: 1.4em;
-    }
+.error-message {
+    display: flex;
+    flex-direction: column;
+    margin: 15px;
 }
 
+.error-message a {
+    margin-top: 5px;
+    font-size: 1.4rem;
+    line-height: 1;
+}
 
 /* Stack trace
 /* ---------------------------------------------------------- */
 
 .error-stack {
-    margin: 1em auto;
-    padding: 2em;
+    margin: 1rem auto;
+    padding: 2rem;
     max-width: 800px;
     background-color: rgba(255, 255, 255, 0.3);
 }
@@ -104,9 +78,9 @@
 .error-stack-list li:before {
     content: "\21AA";
     display: inline-block;
-    margin-right: 0.5em;
+    margin-right: 0.5rem;
     color: #bbb;
-    font-size: 1.2em;
+    font-size: 1.2rem;
 }
 
 .error-stack-function {
diff --git a/core/client/app/templates/error.hbs b/core/client/app/templates/error.hbs
index 6e6f4ac804..20b16f46c0 100644
--- a/core/client/app/templates/error.hbs
+++ b/core/client/app/templates/error.hbs
@@ -1,28 +1,27 @@
-<section class="error-content error-404 js-error-container">
-    <section class="error-details">
-         <figure class="error-image">
+<div class="gh-view">
+    <section class="error-content error-404 js-error-container">
+        <section class="error-details">
              <img class="error-ghost" src="{{gh-path 'admin' '/img/404-ghost@2x.png'}}" srcset="{{gh-path 'admin' '/img/404-ghost.png'}} 1x, {{gh-path 'admin' '/img/404-ghost@2x.png'}} 2x" />
-         </figure>
-         <section class="error-message">
-             <h1 class="error-code">{{code}}</h1>
-             <h2 class="error-description">{{message}}</h2>
-             <a class="error-link" href="{{gh-path 'blog'}}">Go to the front page →</a>
-         </section>
+             <section class="error-message">
+                 <h1 class="error-code">{{code}}</h1>
+                 <h2 class="error-description">{{message}}</h2>
+             </section>
+        </section>
     </section>
-</section>
 
-{{#if stack}}
-    <section class="error-stack">
-        <h3>Stack Trace</h3>
-        <p><strong>{{message}}</strong></p>
-        <ul class="error-stack-list">
-            {{#each stack as |item|}}
-                <li>
-                    at
-                    {{#if item.function}}<em class="error-stack-function">{{item.function}}</em>{{/if}}
-                    <span class="error-stack-file">({{item.at}})</span>
-                </li>
-            {{/each}}
-        </ul>
-    </section>
-{{/if}}
+    {{#if stack}}
+        <section class="error-stack">
+            <h3>Stack Trace</h3>
+            <p><strong>{{message}}</strong></p>
+            <ul class="error-stack-list">
+                {{#each stack as |item|}}
+                    <li>
+                        at
+                        {{#if item.function}}<em class="error-stack-function">{{item.function}}</em>{{/if}}
+                        <span class="error-stack-file">({{item.at}})</span>
+                    </li>
+                {{/each}}
+            </ul>
+        </section>
+    {{/if}}
+</div>
diff --git a/core/server/errors/index.js b/core/server/errors/index.js
index 55f13bc14c..288c0e4f6d 100644
--- a/core/server/errors/index.js
+++ b/core/server/errors/index.js
@@ -280,7 +280,7 @@ errors = {
     },
 
     error404: function (req, res, next) {
-        var message = res.isAdmin && req.user ? 'No Ghost Found' : 'Page Not Found';
+        var message = 'Page not found';
 
         // do not cache 404 error
         res.set({'Cache-Control': 'no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0'});
diff --git a/core/server/views/error.hbs b/core/server/views/error.hbs
deleted file mode 100644
index e7b95c9374..0000000000
--- a/core/server/views/error.hbs
+++ /dev/null
@@ -1,28 +0,0 @@
-{{!< default}}
-<section class="error-content error-404 js-error-container">
-    <section class="error-details">
-        <figure class="error-image">
-            <img class="error-ghost" src="{{asset "img/404-ghost@2x.png" ghost="true"}}" srcset="{{asset "img/404-ghost.png" ghost="true"}} 1x, {{asset "img/404-ghost@2x.png" ghost="true"}} 2x"/>
-        </figure>
-        <section class="error-message">
-            <h1 class="error-code">{{code}}</h1>
-            <h2 class="error-description">{{message}}</h2>
-            <a class="error-link" href="{{@blog.url}}">Go to the front page →</a>
-        </section>
-    </section>
-</section>
-{{#if stack}}
-    <section class="error-stack">
-        <h3>Stack Trace</h3>
-        <p><strong>{{message}}</strong></p>
-        <ul class="error-stack-list">
-            {{#foreach stack}}
-                <li>
-                    at
-                    {{#if function}}<em class="error-stack-function">{{function}}</em>{{/if}}
-                    <span class="error-stack-file">({{at}})</span>
-                </li>
-            {{/foreach}}
-        </ul>
-    </section>
-{{/if}}
diff --git a/core/server/views/user-error.hbs b/core/server/views/user-error.hbs
index a6b61734f5..707afc3c38 100644
--- a/core/server/views/user-error.hbs
+++ b/core/server/views/user-error.hbs
@@ -20,37 +20,39 @@
   </head>
   <body>
     <main role="main" id="main">
-      <div id="container">
-        <section class="error-content error-404 js-error-container">
-          <section class="error-details">
-            <figure class="error-image">
-              <img
-                class="error-ghost"
-                src="{{asset "img/404-ghost@2x.png" ghost="true"}}"
-                srcset="{{asset "img/404-ghost.png" ghost="true"}} 1x, {{asset "img/404-ghost@2x.png" ghost="true"}} 2x"/>
-            </figure>
-            <section class="error-message">
-              <h1 class="error-code">{{code}}</h1>
-              <h2 class="error-description">{{message}}</h2>
-              <a class="error-link" href="{{@blog.url}}">Go to the front page →</a>
-            </section>
-          </section>
-        </section>
-        {{#if stack}}
-          <section class="error-stack">
-            <h3>Stack Trace</h3>
-            <p><strong>{{message}}</strong></p>
-            <ul class="error-stack-list">
-              {{#each stack}}
-                <li>
-                  at
-                  {{#if function}}<em class="error-stack-function">{{function}}</em>{{/if}}
-                  <span class="error-stack-file">({{at}})</span>
-                </li>
-              {{/each}}
-            </ul>
-          </section>
-        {{/if}}
+      <div class="gh-app">
+          <div class="gh-viewport">
+              <div class="gh-view">
+                <section class="error-content error-404 js-error-container">
+                  <section class="error-details">
+                    <img
+                    class="error-ghost"
+                    src="{{asset "img/404-ghost@2x.png" ghost="true"}}"
+                    srcset="{{asset "img/404-ghost.png" ghost="true"}} 1x, {{asset "img/404-ghost@2x.png" ghost="true"}} 2x"/>
+                    <section class="error-message">
+                      <h1 class="error-code">{{code}}</h1>
+                      <h2 class="error-description">{{message}}</h2>
+                      <a class="error-link" href="{{@blog.url}}">Go to the front page →</a>
+                    </section>
+                  </section>
+                </section>
+                {{#if stack}}
+                  <section class="error-stack">
+                    <h3>Stack Trace</h3>
+                    <p><strong>{{message}}</strong></p>
+                    <ul class="error-stack-list">
+                      {{#each stack}}
+                        <li>
+                          at
+                          {{#if function}}<em class="error-stack-function">{{function}}</em>{{/if}}
+                          <span class="error-stack-file">({{at}})</span>
+                        </li>
+                      {{/each}}
+                    </ul>
+                  </section>
+                {{/if}}
+              </div>
+          </div>
       </div>
     </main>
   </body>
diff --git a/core/test/functional/routes/frontend_spec.js b/core/test/functional/routes/frontend_spec.js
index b6021622b5..f53fece1e5 100644
--- a/core/test/functional/routes/frontend_spec.js
+++ b/core/test/functional/routes/frontend_spec.js
@@ -59,7 +59,7 @@ describe('Frontend Routing', function () {
                 request.get('/spectacular/')
                     .expect('Cache-Control', testUtils.cacheRules['private'])
                     .expect(404)
-                    .expect(/Page Not Found/)
+                    .expect(/Page not found/)
                     .end(doEnd(done));
             });
 
@@ -67,7 +67,7 @@ describe('Frontend Routing', function () {
                 request.get('/spectacular/marvellous/')
                     .expect('Cache-Control', testUtils.cacheRules['private'])
                     .expect(404)
-                    .expect(/Page Not Found/)
+                    .expect(/Page not found/)
                     .end(doEnd(done));
             });
 
@@ -75,7 +75,7 @@ describe('Frontend Routing', function () {
                 request.get('/tag/spectacular/')
                     .expect('Cache-Control', testUtils.cacheRules['private'])
                     .expect(404)
-                    .expect(/Page Not Found/)
+                    .expect(/Page not found/)
                     .end(doEnd(done));
             });
 
@@ -83,7 +83,7 @@ describe('Frontend Routing', function () {
                 request.get('/author/spectacular/')
                     .expect('Cache-Control', testUtils.cacheRules['private'])
                     .expect(404)
-                    .expect(/Page Not Found/)
+                    .expect(/Page not found/)
                     .end(doEnd(done));
             });
         });
@@ -178,7 +178,7 @@ describe('Frontend Routing', function () {
                 request.get('/' + date + '/welcome-to-ghost/')
                     .expect('Cache-Control', testUtils.cacheRules['private'])
                     .expect(404)
-                    .expect(/Page Not Found/)
+                    .expect(/Page not found/)
                     .end(doEnd(done));
             });
         });
@@ -204,7 +204,7 @@ describe('Frontend Routing', function () {
                 request.get('/welcome-to-ghost/notedit/')
                     .expect('Cache-Control', testUtils.cacheRules['private'])
                     .expect(404)
-                    .expect(/Page Not Found/)
+                    .expect(/Page not found/)
                     .end(doEnd(done));
             });
         });
diff --git a/core/test/unit/error_handling_spec.js b/core/test/unit/error_handling_spec.js
index 2761f4b053..dceec34010 100644
--- a/core/test/unit/error_handling_spec.js
+++ b/core/test/unit/error_handling_spec.js
@@ -319,7 +319,7 @@ describe('Error handling', function () {
                 view.should.match(/user-error\.hbs/);
 
                 // Test that the message is correct
-                options.message.should.equal('Page Not Found');
+                options.message.should.equal('Page not found');
                 options.code.should.equal(404);
                 this.statusCode.should.equal(404);
 
@@ -350,7 +350,7 @@ describe('Error handling', function () {
                 view.should.match(/user-error\.hbs/);
 
                 // Test that the message is correct
-                options.message.should.equal('Page Not Found');
+                options.message.should.equal('Page not found');
                 options.code.should.equal(404);
                 this.statusCode.should.equal(404);