diff --git a/packages/shared/themes/base.ts b/packages/shared/themes/base.ts
index c945a25192..5742dae5ab 100644
--- a/packages/shared/themes/base.ts
+++ b/packages/shared/themes/base.ts
@@ -69,6 +69,7 @@ const {
   lightBlueMain,
   lightBlueMainHover,
   lightBlueMainDisabled,
+  lightBlueMainPressed,
   lightSecondMain,
   lightSecondMainHover,
   lightSecondMainDisabled,
@@ -298,7 +299,7 @@ export const getBaseTheme = () => {
         separatorBackground: white,
 
         buttonColor: white,
-        hoverButtonColor: "#3a6c9e",
+        hoverButtonColor: lightBlueMainPressed,
 
         backgroundActionMobile: blueLightMid,
       },
@@ -312,7 +313,7 @@ export const getBaseTheme = () => {
       backgroundColor: lightBlueMain,
       disableBackgroundColor: lightBlueMainDisabled,
       hoverBackgroundColor: lightBlueMainHover,
-      clickBackgroundColor: "#4074BC",
+      clickBackgroundColor: lightBlueMainPressed,
 
       padding: "5px 14px 5px 12px",
       borderRadius: "3px",
@@ -1892,6 +1893,7 @@ export const getBaseTheme = () => {
 
       groups: {
         textColor: gray,
+        tagColor: grayStrong,
       },
     },
 
@@ -2782,6 +2784,7 @@ export const getBaseTheme = () => {
             sideColor: gray,
             nameColor: black,
             textColor: gray,
+            subheaderColor: lightGrayDark,
           },
           ip: {
             errorColor: lightErrorStatus,
@@ -2801,6 +2804,7 @@ export const getBaseTheme = () => {
             accentBoxBackground: grayLightMid,
             buttonBoxBackground: grayLightMid,
             iconFill: gray,
+            addThemeBackground: grayStrong,
           },
 
           whiteLabel: {
@@ -2838,7 +2842,11 @@ export const getBaseTheme = () => {
             iconButtonDisabled: gray,
             border: `1px solid ${grayStrong}`,
           },
-
+          ldap: {
+            border: `1px solid ${grayLightMid}`,
+            errorBorder: `1px solid ${lightErrorStatus}`,
+            certificateBackground: grayLight,
+          },
           smtp: {
             requirementColor: lightErrorStatus,
           },
@@ -2915,6 +2923,7 @@ export const getBaseTheme = () => {
           groupMenuBorder: `1px solid ${white}`,
           groupMenuBoxShadow: "rgba(4, 15, 27, 0.07) 0px 5px 5px 0px",
           linkColor: lightBlueMain,
+          background: grayLight,
         },
         storageManagement: {
           grayBackgroundText: grayText,
@@ -2932,6 +2941,8 @@ export const getBaseTheme = () => {
           linkColor: link,
           spanBackground: lightBlueMain,
           filterBorder: `1px solid ${grayStrong}`,
+          toastBackground: lightToastWarning,
+          background: grayLight,
         },
       },
 
@@ -3001,6 +3012,8 @@ export const getBaseTheme = () => {
         pendingEmailTextColor: gray,
 
         mobileRowBackground: grayLight,
+
+        iconFill: lightGrayDark,
       },
       login: {
         textColor: gray,
diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts
index 242fc464b0..a77bb05c2a 100644
--- a/packages/shared/themes/dark.ts
+++ b/packages/shared/themes/dark.ts
@@ -57,6 +57,7 @@ const {
   lightBlueMain,
   lightBlueMainHover,
   lightBlueMainDisabled,
+  lightBlueMainPressed,
   lightSecondMain,
   lightSecondMainHover,
   lightSecondMainDisabled,
@@ -302,7 +303,7 @@ const Dark: TTheme = {
     backgroundColor: lightBlueMain,
     disableBackgroundColor: lightBlueMainDisabled,
     hoverBackgroundColor: lightBlueMainHover,
-    clickBackgroundColor: "#4074BC",
+    clickBackgroundColor: lightBlueMainPressed,
 
     padding: "5px 14px 5px 12px",
     borderRadius: "3px",
@@ -1876,6 +1877,7 @@ const Dark: TTheme = {
 
     groups: {
       textColor: grayDark,
+      tagColor: grayDarkStrong,
     },
   },
 
@@ -2766,6 +2768,7 @@ const Dark: TTheme = {
           sideColor: grayDark,
           nameColor: white,
           textColor: grayDark,
+          subheaderColor: darkGrayDark,
         },
         ip: {
           errorColor: darkErrorStatus,
@@ -2785,6 +2788,7 @@ const Dark: TTheme = {
           accentBoxBackground: grayDarkStrong,
           buttonBoxBackground: grayDarkStrong,
           iconFill: grayDark,
+          addThemeBackground: grayDarkStrong,
         },
 
         whiteLabel: {
@@ -2822,7 +2826,11 @@ const Dark: TTheme = {
           iconButtonDisabled: black,
           border: `1px solid ${grayDarkStrong}`,
         },
-
+        ldap: {
+          border: `1px solid ${grayDarkStrong}`,
+          errorBorder: `1px solid ${darkErrorStatus}`,
+          certificateBackground: grayDarkStrong,
+        },
         smtp: {
           requirementColor: darkErrorStatus,
         },
@@ -2896,6 +2904,7 @@ const Dark: TTheme = {
         groupMenuBorder: `1px solid ${grayDarkStrong}`,
         groupMenuBoxShadow: "rgba(0, 0, 0, 0.16) 0px 5px 5px 0px",
         linkColor: lightBlueMain,
+        background: darkGrayLight,
       },
       storageManagement: {
         grayBackgroundText: grayDark,
@@ -2913,6 +2922,8 @@ const Dark: TTheme = {
         linkColor: lightBlueMain,
         spanBackground: lightBlueMain,
         filterBorder: `1px solid ${black}`,
+        toastBackground: darkToastWarning,
+        background: darkGrayLight,
       },
     },
 
@@ -2982,6 +2993,8 @@ const Dark: TTheme = {
       pendingEmailTextColor: grayDark,
 
       mobileRowBackground: lightDarkGrayHover,
+
+      iconFill: darkGrayDark,
     },
     login: {
       textColor: grayDark,
diff --git a/packages/shared/themes/globalColors.ts b/packages/shared/themes/globalColors.ts
index 22b5c757b7..11f517051c 100644
--- a/packages/shared/themes/globalColors.ts
+++ b/packages/shared/themes/globalColors.ts
@@ -50,6 +50,7 @@ export const globalColors = {
   lightBlueMain: "#4781D1",
   lightBlueMainHover: "rgba(71, 129, 209, 0.85)",
   lightBlueMainDisabled: "rgba(71, 129, 209, 0.6)",
+  lightBlueMainPressed: "#4074bc",
   lightSecondMain: "#5299E0",
   lightSecondMainHover: "rgba(82, 153, 224, 0.85)",
   lightSecondMainDisabled: "rgba(82, 153, 224, 0.6)",