diff --git a/public/img/404.png b/public/img/404.png
new file mode 100644
index 00000000000..1f0ee0ef495
Binary files /dev/null and b/public/img/404.png differ
diff --git a/public/img/500.png b/public/img/500.png
new file mode 100644
index 00000000000..2c122fde93f
Binary files /dev/null and b/public/img/500.png differ
diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl
index 4e836b228d6..c2cafe0c9dd 100644
--- a/templates/status/404.tmpl
+++ b/templates/status/404.tmpl
@@ -1,7 +1,8 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
-    <h4>This page is not found !</h4>
+<div id="gogs-body" class="container text-center">
+    <p style="margin-top: 80px"><img src="/img/404.png" alt="404"/></p>
+    <hr/>
     <p>Application Version: {{AppVer}}</p>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/status/500.tmpl b/templates/status/500.tmpl
index 9a00eb1ff74..f3cd24d6964 100644
--- a/templates/status/500.tmpl
+++ b/templates/status/500.tmpl
@@ -1,7 +1,10 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div id="gogs-body" class="container">
+<div id="gogs-body" class="container text-center">
+    <p style="margin-top: 80px"><img src="/img/500.png" alt="404"/></p>
+    <hr/>
     <p>An error is occurred : {{.ErrorMsg}}</p>
+    <hr/>
     <p>Application Version: {{AppVer}}</p>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file