diff --git a/build/scss/_colors.scss b/build/scss/_colors.scss
index dc90e2c2f..0eb87c846 100644
--- a/build/scss/_colors.scss
+++ b/build/scss/_colors.scss
@@ -95,4 +95,7 @@ a.text-muted:hover {
     background-color: lighten($dark, 7.5%) !important;
     color: $white !important;
   }
+  .link-black {
+    color: $gray-400;
+  }
 }
diff --git a/build/scss/_direct-chat.scss b/build/scss/_direct-chat.scss
index dc9897041..a75b5ee0f 100644
--- a/build/scss/_direct-chat.scss
+++ b/build/scss/_direct-chat.scss
@@ -233,7 +233,9 @@
     &::before {
       border-right-color: lighten($dark, 10%);
     }
-
+  }
+  .direct-chat-timestamp {
+    color: $gray-500;
   }
   .right > .direct-chat-text {
     &::after,
diff --git a/build/scss/_dropdown.scss b/build/scss/_dropdown.scss
index 78ff27ced..a89e040a6 100644
--- a/build/scss/_dropdown.scss
+++ b/build/scss/_dropdown.scss
@@ -286,4 +286,36 @@
   .dropdown-divider {
     border-color: $gray-600;
   }
+
+  .navbar-nav > .user-menu > .dropdown-menu {
+    > .user-footer {
+      background-color: lighten($dark, 2.5%);
+      color: $white;
+
+      .btn-default {
+        color: $white;
+
+        &:hover,
+        &:focus {
+          background-color: lighten($dark, 5%);
+          color: $gray-300;
+        }
+        &:focus {
+          background-color: lighten($dark, 7.5%);
+        }
+      }
+    }
+    > .user-body {
+      border-color: $gray-600;
+    }
+    > .user-body a {
+      background-color: transparent !important;
+      color: $white !important;
+
+      &:hover,
+      &:focus {
+        color: $gray-400 !important;
+      }
+    }
+  }
 }
diff --git a/build/scss/_forms.scss b/build/scss/_forms.scss
index 48fd7bec6..5a37e7151 100644
--- a/build/scss/_forms.scss
+++ b/build/scss/_forms.scss
@@ -332,23 +332,28 @@ body.text-sm {
 }
 
 .dark-mode {
-  .form-control:not(.form-control-navbar):not(.is-invalid),
+  .form-control,
   .custom-select,
   .custom-file-label,
   .custom-file-label::after,
   .custom-control-label::before,
   .input-group-text {
     background-color: $dark;
-    border-color: $gray-600;
     color: $white;
   }
-
+  .form-control:not(.form-control-navbar):not(.is-invalid):not(:focus) {
+    border-color: $gray-600;
+  }
   select {
     background-color: $dark;
     color: $white;
     border-color: $gray-600;
   }
 
+  .input-group-text {
+    border-color: $gray-600;
+  }
+
   .custom-control-input:disabled ~ .custom-control-label::before,
   .custom-control-input[disabled] ~ .custom-control-label::before {
     background-color: lighten($dark, 5%);
@@ -367,4 +372,30 @@ body.text-sm {
       background-color: lighten($dark, 7.5%);
     }
   }
+
+  .navbar-dark {
+    .btn-navbar,
+    .form-control-navbar {
+      background-color: $dark;
+      border: $input-border-width solid $gray-600;
+    }
+    .btn-navbar {
+      &:hover {
+        background-color: lighten($sidebar-dark-bg, 7.5%);
+      }
+      &:focus {
+        background-color: lighten($sidebar-dark-bg, 10%);
+      }
+    }
+
+    .form-control-navbar + .input-group-prepend,
+    .form-control-navbar + .input-group-append {
+      > .btn-navbar {
+        background-color: lighten($dark, 5%);
+        color: $white;
+        border: $input-border-width solid $gray-600;
+        border-left: none;
+      }
+    }
+  }
 }
diff --git a/build/scss/_layout.scss b/build/scss/_layout.scss
index e2426c44c..387ef0c4f 100644
--- a/build/scss/_layout.scss
+++ b/build/scss/_layout.scss
@@ -627,7 +627,8 @@ body:not(.sidebar-mini-md) {
 }
 
 .dark-mode {
-  background-color: lighten($dark, 7.5%);
+  background-color: lighten($dark, 7.5%) !important;
+  color: $white;
 
   .breadcrumb-item {
     &.active,
diff --git a/build/scss/_miscellaneous.scss b/build/scss/_miscellaneous.scss
index 27dbee3e5..4489ca172 100644
--- a/build/scss/_miscellaneous.scss
+++ b/build/scss/_miscellaneous.scss
@@ -483,7 +483,7 @@ blockquote {
 }
 
 .dark-mode {
-  a:hover {
+  a:not(.btn):hover {
     color: lighten($link-color, 10%);
   }
   .attachment-block {
@@ -504,4 +504,8 @@ blockquote {
   .tab-custom-content {
     border-color: $gray-600;
   }
+  .list-group-item {
+    background-color: $dark;
+    border-color: $gray-600;
+  }
 }
diff --git a/build/scss/_timeline.scss b/build/scss/_timeline.scss
index 60c9f91a8..3f59df407 100644
--- a/build/scss/_timeline.scss
+++ b/build/scss/_timeline.scss
@@ -134,12 +134,22 @@
 }
 
 .dark-mode {
-  .timeline > div > .timeline-item {
-    background-color: $dark;
-    color: $white;
+  .timeline {
+    &::before {
+      background-color: $gray-600;
+    }
+    > div > .timeline-item {
+      background-color: $dark;
+      color: $white;
+      border-color: $gray-600;
 
-    > .timeline-header {
-      color: $gray-500;
+      > .timeline-header {
+        color: $gray-400;
+        border-color: $gray-600;
+      }
+      > .time {
+        color: $gray-400;
+      }
     }
   }
 }
diff --git a/build/scss/pages/_invoice.scss b/build/scss/pages/_invoice.scss
index 856e9e0a3..0affe2fc0 100644
--- a/build/scss/pages/_invoice.scss
+++ b/build/scss/pages/_invoice.scss
@@ -11,3 +11,9 @@
 .invoice-title {
   margin-top: 0;
 }
+
+.dark-mode {
+  .invoice {
+    background-color: $dark;
+  }
+}
diff --git a/build/scss/pages/_lockscreen.scss b/build/scss/pages/_lockscreen.scss
index 2a7da7b59..20454e79e 100644
--- a/build/scss/pages/_lockscreen.scss
+++ b/build/scss/pages/_lockscreen.scss
@@ -76,3 +76,18 @@
 .lockscreen-footer {
   margin-top: 10px;
 }
+
+.dark-mode {
+  .lockscreen-item {
+    background-color: $dark;
+  }
+  .lockscreen-logo a {
+    color: $white;
+  }
+  .lockscreen-credentials .btn {
+    background-color: $dark;
+  }
+  .lockscreen-image {
+    background-color: $gray-600;
+  }
+}
diff --git a/build/scss/pages/_login_and_register.scss b/build/scss/pages/_login_and_register.scss
index d0e262a93..e588450bb 100644
--- a/build/scss/pages/_login_and_register.scss
+++ b/build/scss/pages/_login_and_register.scss
@@ -52,6 +52,7 @@
       &:focus {
         box-shadow: none;
 
+        & ~ .input-group-prepend .input-group-text,
         & ~ .input-group-append .input-group-text {
           border-color: $input-focus-border-color;
         }
@@ -62,6 +63,7 @@
           box-shadow: none;
         }
 
+        & ~ .input-group-prepend .input-group-text,
         & ~ .input-group-append .input-group-text {
           border-color: $success;
         }
@@ -99,3 +101,18 @@
 .social-auth-links {
   margin: 10px 0;
 }
+
+.dark-mode {
+  .login-card-body,
+  .register-card-body {
+    background-color: $dark;
+    border-color: $gray-600;
+    color: $white;
+  }
+  .login-logo,
+  .register-logo {
+    a {
+      color: $white;
+    }
+  }
+}
diff --git a/build/scss/pages/_profile.scss b/build/scss/pages/_profile.scss
index e007ad0e5..34afca993 100644
--- a/build/scss/pages/_profile.scss
+++ b/build/scss/pages/_profile.scss
@@ -35,3 +35,10 @@
     width: 100%;
   }
 }
+
+.dark-mode {
+  .post {
+    color: $white;
+    border-color: $gray-600;
+  }
+}
diff --git a/build/scss/plugins/_icheck-bootstrap.scss b/build/scss/plugins/_icheck-bootstrap.scss
index 2a5f49bd5..ba5a68b16 100644
--- a/build/scss/plugins/_icheck-bootstrap.scss
+++ b/build/scss/plugins/_icheck-bootstrap.scss
@@ -39,3 +39,12 @@
     border-color: #{$color};
   }
 }
+
+.dark-mode {
+  [class*="icheck-"] > input:first-child:not(:checked) {
+    + input[type="hidden"] + label::before,
+    + label::before {
+      border-color: $gray-600;
+    }
+  }
+}