diff --git a/webadmin/src/appstatus.html b/webadmin/src/appstatus.html
index d8e260165..c7d0f5360 100644
--- a/webadmin/src/appstatus.html
+++ b/webadmin/src/appstatus.html
@@ -11,9 +11,7 @@
     <link href="//fonts.googleapis.com/css?family=Roboto:300" rel="stylesheet" type="text/css">
 
     <!-- Theme CSS -->
-    <style>
-        <% include ../dist/theme.css %>
-    </style>
+    <link href="theme.css" rel="stylesheet" type="text/css">
 
 </head>
 
diff --git a/webadmin/src/error.html b/webadmin/src/error.html
index abdab94cb..77dbb8308 100644
--- a/webadmin/src/error.html
+++ b/webadmin/src/error.html
@@ -24,7 +24,7 @@
     <script src="js/error.js"></script>
 
     <!-- Theme CSS -->
-    <link href="theme.css" rel="stylesheet">
+    <link href="theme.css" rel="stylesheet" type="text/css">
 
 </head>
 
diff --git a/webadmin/src/nakeddomain.html b/webadmin/src/nakeddomain.html
index 19c013f5f..8c4ad814c 100644
--- a/webadmin/src/nakeddomain.html
+++ b/webadmin/src/nakeddomain.html
@@ -13,31 +13,8 @@
     <!-- jQuery-->
     <script src="3rdparty/js/jquery.min.js"></script>
 
-    <style>
-
-        html, body {
-            width: 100%;
-            height: 100%;
-            padding: 0;
-            margin: 0;
-            font-family: Roboto,Helvetica,Arial,sans-serif;
-        }
-
-        .wrapper {
-            display: table;
-            width: 100%;
-            height: 100%;
-        }
-
-        .content {
-            display: table-cell;
-            width: 100%;
-            height: 100%;
-            text-align: center;
-            vertical-align: middle;
-        }
-
-    </style>
+    <!-- Theme CSS -->
+    <link href="theme.css" rel="stylesheet" type="text/css">
 
     <script>
 
@@ -60,8 +37,8 @@
 
 <body>
 
-<div class="wrapper">
-    <div class="content">
+<div class="status-wrapper">
+    <div class="status-content">
         <img src="/img/logo_inverted_192.png"/>
         <h1 id="title"> Cloudron </h1>
         <p>
diff --git a/webadmin/src/theme.scss b/webadmin/src/theme.scss
index d04ffc3a7..22a7c5eac 100644
--- a/webadmin/src/theme.scss
+++ b/webadmin/src/theme.scss
@@ -641,3 +641,21 @@ $graphs-success-alt:    lighten(#27CE65, 20%);
         font-weight: bold;
     }
 }
+
+
+// ----------------------------
+// Error and status page classes
+// ----------------------------
+.status-wrapper {
+    display: table;
+    width: 100%;
+    height: 100%;
+}
+
+.status-content {
+    display: table-cell;
+    width: 100%;
+    height: 100%;
+    text-align: center;
+    vertical-align: middle;
+}
