diff --git a/core/css/apps/_ldap.scss b/core/css/apps/_ldap.scss
index 13fafaa..fb852cd 100644
--- a/core/css/apps/_ldap.scss
+++ b/core/css/apps/_ldap.scss
@@ -5,9 +5,18 @@
         background-color: $background-normal;
     }
 
-    ul.ui-tabs-nav .ui-tabs-active {
-        &, & > a {
-            background-color: $background-dark;
-        }
+    ul.ui-tabs-nav .ui-tabs-active,
+    ul.ui-tabs-nav .ui-tabs-active > a {
+        background-color: $background-dark;
+        color: $foreground-active;
+        border-bottom-color: $decoration-active;
+    }
+
+    div.ui-accordion-content {
+        background: $background-normal;
+    }
+
+    .ldap_grey {
+        color: $foreground-normal;
     }
 }
\ No newline at end of file
diff --git a/core/css/core/_icons.scss b/core/css/core/_icons.scss
index 68b65b4..750702b 100644
--- a/core/css/core/_icons.scss
+++ b/core/css/core/_icons.scss
@@ -692,11 +692,6 @@ a.impersonate img.svg {
 	height: 16px;
 }
 
-// Info icon in ldap settings
-#ldapSettings .ldapWizardControls a img {
-    filter: invert(95%);
-}
-
 // Play button in Music App under All Tracks menu
 
 .app-music {
@@ -706,6 +701,11 @@ a.impersonate img.svg {
 	}
 }
 
+// Arrow in advanved ldap settings
+#ldapSettings .ui-accordion .ui-accordion-header .ui-accordion-header-icon {
+	filter: invert(95%);
+}
+
 // Apps with generic icons names
 
 .app-settings {
diff --git a/core/css/core/_style.scss b/core/css/core/_style.scss
index 77047a8..4777628 100644
--- a/core/css/core/_style.scss
+++ b/core/css/core/_style.scss
@@ -215,4 +215,49 @@ input[type="button"] {
 	background-color: $background-normal;
 	font-weight: bold;
 	color: $foreground-normal;
+}
+
+.ui-tabs .ui-tabs-nav .ui-state-default {
+    background-color: $background-dark;
+    border-bottom-color: $decoration-normal;
+    
+    a {
+        color: $foreground-normal;
+    }
+}
+
+.ui-tabs .ui-tabs-nav .ui-state-hover {
+    background-color: $background-dark;
+    border-bottom-color: $decoration-active;
+    
+    a:hover {
+        color: $foreground-normal;
+    }
+}
+
+.ui-state-default.ui-state-disabled {
+    background-color: $background-alternate;
+    opacity: 0.5;
+
+    a {
+        color: $foreground-normal;
+    }
+}
+
+ul.ui-tabs-nav .ui-tabs-active,
+ul.ui-tabs-nav .ui-tabs-active > a {
+    background-color: $background-dark;
+    color: $foreground-active;
+    border-bottom-color: $decoration-active;
+}
+
+.ui-accordion {
+
+	.ui-accordion-header {
+		background-color: $background-dark;
+	}
+
+	.ui-accordion-content {
+		background-color: $background-normal;
+	}
 }
\ No newline at end of file
diff --git a/core/css/server.css b/core/css/server.css
index 2315e42..d266a16 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -498,10 +498,10 @@ a.impersonate img.svg {
   width: 16px;
   height: 16px; }
 
-#ldapSettings .ldapWizardControls a img {
+.app-music img.play.svg, .app-music img.control {
   filter: invert(95%); }
 
-.app-music img.play.svg, .app-music img.control {
+#ldapSettings .ui-accordion .ui-accordion-header .ui-accordion-header-icon {
   filter: invert(95%); }
 
 .app-settings #app-navigation img[src$="/img/app-dark.svg"] {
@@ -750,6 +750,35 @@ input[type="button"] {
   font-weight: bold;
   color: #eff0f1; }
 
+.ui-tabs .ui-tabs-nav .ui-state-default {
+  background-color: #232629;
+  border-bottom-color: #706f6e; }
+  .ui-tabs .ui-tabs-nav .ui-state-default a {
+    color: #eff0f1; }
+
+.ui-tabs .ui-tabs-nav .ui-state-hover {
+  background-color: #232629;
+  border-bottom-color: #3daee9; }
+  .ui-tabs .ui-tabs-nav .ui-state-hover a:hover {
+    color: #eff0f1; }
+
+.ui-state-default.ui-state-disabled {
+  background-color: #4d4d4d;
+  opacity: 0.5; }
+  .ui-state-default.ui-state-disabled a {
+    color: #eff0f1; }
+
+ul.ui-tabs-nav .ui-tabs-active,
+ul.ui-tabs-nav .ui-tabs-active > a {
+  background-color: #232629;
+  color: #fcfcfc;
+  border-bottom-color: #3daee9; }
+
+.ui-accordion .ui-accordion-header {
+  background-color: #232629; }
+.ui-accordion .ui-accordion-content {
+  background-color: #31363b; }
+
 /* Login Screen ------------------------------------------------------------- */
 #body-login {
   background-image: url(../../loginbackground.png), url(../../loginbackground.jpg) !important;
@@ -1789,8 +1818,15 @@ td.date, td.date > span {
   background-color: #31363b; }
   #ldapSettings > fieldset {
     background-color: #31363b; }
-  #ldapSettings ul.ui-tabs-nav .ui-tabs-active, #ldapSettings ul.ui-tabs-nav .ui-tabs-active > a {
-    background-color: #232629; }
+  #ldapSettings ul.ui-tabs-nav .ui-tabs-active,
+  #ldapSettings ul.ui-tabs-nav .ui-tabs-active > a {
+    background-color: #232629;
+    color: #fcfcfc;
+    border-bottom-color: #3daee9; }
+  #ldapSettings div.ui-accordion-content {
+    background: #31363b; }
+  #ldapSettings .ldap_grey {
+    color: #eff0f1; }
 
 /* Log reader --------------------------------------------------------------- */
 #logreader-root table tbody tr td {