diff --git a/src/theme.scss b/src/theme.scss
index b234ae644..d47a43712 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1678,3 +1678,68 @@ tag-input {
         height: 100%;
     }
 }
+
+
+// ----------------------------
+// Dark mode overrides
+// ----------------------------
+
+@media (prefers-color-scheme: dark) {
+    body {
+        color: #777;
+        background-color: #2b2b2e;
+    }
+
+    .navbar-default {
+        background-color: #1c1c1c;
+        border-color: #1c1c1c;
+    }
+
+    .navbar .navbar-collapse {
+        background-color: #1c1c1c;
+    }
+
+    .grid-item-content {
+        background-color: #1c1c1c;
+    }
+
+    footer, .card, .app-configure-links div.active {
+        background-color: #1c1c1c;
+    }
+
+    .app-configure-links div:hover {
+        background-color: #1c1c1c;
+        color: #777;
+    }
+
+    .app-configure-links div {
+        color: #777;
+    }
+
+    multiselect .dropdown-toggle {
+        background-color: #1c1c1c;
+        border-color: #1c1c1c;
+    }
+
+    .btn-default {
+        color: #777;
+    }
+
+    input {
+        background-color: #2b2b2e;
+    }
+
+    tag-input .tag-input-container input {
+        color: #777;
+    }
+
+    .form-control {
+        background-color: #2b2b2e;
+        border-color: #676767;
+        color: #777;
+    }
+
+    .app-configure .app-header-container h1 a {
+        color: #777;
+    }
+}
\ No newline at end of file
diff --git a/src/views/apps.html b/src/views/apps.html
index 3c6949abd..92a2f86d0 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -121,7 +121,7 @@
       <div class="app-grid">
         <div class="grid-item" ng-repeat="app in installedApps | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | appSearchFilter:appSearch | orderBy:'fqdn'">
           <a ng-href="{{ app | applicationLink }}" ng-click="user.isAtLeastAdmin && (((app | installError) === true || (app | installationActive) === true) && showAppConfigure(app, 'repair')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError)  || (app | installationActive)}">
-            <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}" tooltip-class="long nowrap">
+            <div class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}" tooltip-class="long nowrap">
               <div class="grid-item-top">
                 <div class="row">
                   <div class="col-xs-12 text-center" style="padding-left: 5px; padding-right: 5px;">