diff --git a/src/error.html b/src/error.html
index d98c87316..d7183f8b0 100644
--- a/src/error.html
+++ b/src/error.html
@@ -56,6 +56,14 @@
 
     </script>
 
+    <style>
+
+    h3 {
+        padding-bottom: 15px;
+    }
+
+    </style>
+
 </head>
 
 <body class="status-page">
@@ -66,22 +74,22 @@
         <h1> Cloudron </h1>
 
         <div ng-show="errorCode == 0">
-            <h3> <i class="fa fa-frown-o fa-fw text-danger"></i> Something has gone wrong </h3>
-            <span ng-show="statusOk">Please try again reloading the page <a href="/">here</a>.</span>
+            <h3> <i class="far fa-frown fa-fw text-danger"></i> Something has gone wrong </h3>
+            <a class="btn btn-primary" href="/" ng-show="statusOk">Back to the dashboard</a>
         </div>
 
         <div ng-show="errorCode == 1">
-            <h3> <i class="fa fa-frown-o fa-fw text-danger"></i> Cloudron is not setup </h3>
+            <h3> <i class="far fa-frown fa-fw text-danger"></i> Cloudron is not setup </h3>
             Please use the setup link you received via mail.
         </div>
 
         <div ng-show="errorCode == 2">
-            <h3> <i class="fa fa-frown-o fa-fw text-danger"></i> Setup requires a setupToken in the query </h3>
+            <h3> <i class="far fa-frown fa-fw text-danger"></i> Setup requires a setupToken in the query </h3>
             Please use the setup link you received via mail.
         </div>
 
         <div ng-show="errorCode == 3">
-            <h3> <i class="fa fa-frown-o fa-fw text-danger"></i> Setup requires an email in the query </h3>
+            <h3> <i class="far fa-frown fa-fw text-danger"></i> Setup requires an email in the query </h3>
             Please use the setup link you received via mail.
         </div>
     </div>
@@ -90,7 +98,7 @@
 
 <footer class="text-center">
     <span class="text-muted">&copy;2018 <a href="https://cloudron.io" target="_blank">Cloudron</a></span>
-    <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fa fa-twitter"></i></a></span>
+    <span class="text-muted"><a href="https://twitter.com/cloudron_io" target="_blank">Twitter <i class="fab fa-twitter"></i></a></span>
     <span class="text-muted"><a href="https://forum.cloudron.io" target="_blank">Forum <i class="fa fa-comments"></i></a></span>
 </footer>
 
