diff --git a/CSS/themes/adguard/adguard-base.css b/CSS/themes/adguard/adguard-base.css
index cc09217b..390d75ed 100644
--- a/CSS/themes/adguard/adguard-base.css
+++ b/CSS/themes/adguard/adguard-base.css
@@ -95,11 +95,12 @@ a:-webkit-any-link:focus {
     filter: invert(1);
 }
 .header .btn-outline-secondary {
-    color: var(--button-color);
+    color: var(--text);
+    background: var(--button-color);
     border-color: var(--button-color);
 }
 .header .btn-outline-secondary:hover {
-    color: var(--text);
+    color: var(--text-hover);
     background-color: var(--button-color-hover);
 }
 .nav-tabs .nav-link.active {
@@ -150,18 +151,18 @@ a:-webkit-any-link:focus {
 }
     /* BUTTONS */
     .container .btn-outline-primary {
-        color: var(--button-color);
-        background-color: transparent;
+        color: var(--text);
+        background-color: var(--button-color);
         background-image: none;
         border-color: var(--button-color);
     }
     .container .btn-outline-primary:hover {
-        color: var(--text);
+        color: var(--text-hover);
         background-color: var(--button-color-hover);
         border-color: var(--button-color-hover); 
     }
     .tooltip-container {
-        background: var(--modal-bg-color);
+        background: var(--tooltip-bg);
       }
     /* CARDS*/
     .card {
@@ -169,6 +170,12 @@ a:-webkit-any-link:focus {
         border: 1px solid rgba(255, 255, 255, 0.1);
         color: var(--text);
     }
+    .tooltip-custom__container {
+        background: var(--tooltip-bg);
+    }
+    .tooltip-custom__content-link {
+        color: var(--tooltip-link-color);
+    }
     .card-wrap, .card-title-stats {
         color: inherit;
     }
@@ -237,6 +244,9 @@ a:-webkit-any-link:focus {
     .rt-tr-group.red {
         background-color: rgb(244 67 54 / 30%);
     }
+    .rt-tr-group.blue {
+        background-color: rgb(54 146 244 / 30%);
+    }
     .ReactTable .rt-noData {
         background: transparent;
     }
@@ -254,13 +264,14 @@ a:-webkit-any-link:focus {
     .form-control--transparent {
         color: var(--text);
     }
-    .form-control--search {
+     .form-control--search {
         outline: none;
     }
     .form-control:focus {
         border-color: transparent;
        -webkit-box-shadow: none;
         box-shadow: none;
+        background: #ffffff !important;
     }
 .icon--selected {
     background-color: rgb(255 255 255 / 15%);
diff --git a/CSS/themes/adguard/aquamarine.css b/CSS/themes/adguard/aquamarine.css
index 01d949d5..3ac6828c 100644
--- a/CSS/themes/adguard/aquamarine.css
+++ b/CSS/themes/adguard/aquamarine.css
@@ -21,7 +21,8 @@
   --button-color-hover: #12afa0;
   --accent-color:  #009688;
   --accent-color-hover: #12afa0;
-
+  --tooltip-bg: #009688;
+  --tooltip-link-color: #f1c40f;
   --text: #eee;
   --text-hover: #fff;
 }
\ No newline at end of file
diff --git a/CSS/themes/adguard/dark.css b/CSS/themes/adguard/dark.css
index 0beff5fd..7dff3868 100644
--- a/CSS/themes/adguard/dark.css
+++ b/CSS/themes/adguard/dark.css
@@ -21,7 +21,8 @@
   --button-color-hover: hsla(0,0%,100%,.30);
   --accent-color:  rgba(255, 255, 255, 0.25);
   --accent-color-hover: rgba(255, 255, 255, 0.45);
-
+  --tooltip-bg: #1f1f1f;
+  --tooltip-link-color: #f1c40f;
   --text: #eee;
   --text-hover: #fff;
 }
\ No newline at end of file
diff --git a/CSS/themes/adguard/hotline.css b/CSS/themes/adguard/hotline.css
index 479b988a..4cd60075 100644
--- a/CSS/themes/adguard/hotline.css
+++ b/CSS/themes/adguard/hotline.css
@@ -21,7 +21,8 @@
   --button-color-hover: hsla(0,0%,100%,.30);
   --accent-color:  #F44336;
   --accent-color-hover: #0b3161;
-
+  --tooltip-bg: #F44336;
+  --tooltip-link-color: #0b3161;
   --text: #eee;
   --text-hover: #fff;
 }
\ No newline at end of file
diff --git a/CSS/themes/adguard/organizr-dark.css b/CSS/themes/adguard/organizr-dark.css
index 4d86cea9..f0620791 100644
--- a/CSS/themes/adguard/organizr-dark.css
+++ b/CSS/themes/adguard/organizr-dark.css
@@ -21,7 +21,8 @@
   --button-color-hover: rgb(44 171 227 / .8);
   --accent-color:  #2cabe3;
   --accent-color-hover: white;
-
+  --tooltip-bg: #1b1b1b;
+  --tooltip-link-color: #2cabe3;
   --text: #eee;
   --text-hover: #fff;
   }
\ No newline at end of file
diff --git a/CSS/themes/adguard/plex.css b/CSS/themes/adguard/plex.css
index 7ca0228c..ace87a24 100644
--- a/CSS/themes/adguard/plex.css
+++ b/CSS/themes/adguard/plex.css
@@ -21,7 +21,8 @@
   --button-color-hover: #e59029;
   --accent-color:  #e5a00d;
   --accent-color-hover: #ffc107;
-
+  --tooltip-bg: #1f1f1f;
+  --tooltip-link-color: #e5a00d;
   --text: #eee;
   --text-hover: #fff;
 }
\ No newline at end of file
diff --git a/CSS/themes/adguard/space-gray.css b/CSS/themes/adguard/space-gray.css
index 6a37a708..edcbea3c 100644
--- a/CSS/themes/adguard/space-gray.css
+++ b/CSS/themes/adguard/space-gray.css
@@ -21,7 +21,8 @@
   --button-color-hover: #81a6b7;
   --accent-color: #607D8B;
   --accent-color-hover: #81a6b7;
-
+  --tooltip-bg: #607D8B;
+  --tooltip-link-color: #f1c40f;
   --text: #eee;
   --text-hover: #fff;
 }
\ No newline at end of file