diff --git a/packages/shared/themes/base.ts b/packages/shared/themes/base.ts
index e5d74e9a20..6fa338a103 100644
--- a/packages/shared/themes/base.ts
+++ b/packages/shared/themes/base.ts
@@ -1912,6 +1912,10 @@ export const getBaseTheme = () => {
       search: {
         boxShadow: "0px 5px 20px 0px rgba(4, 15, 27, 0.07)",
       },
+
+      groups: {
+        textColor: gray,
+      },
     },
 
     filesArticleBody: {
@@ -2394,6 +2398,7 @@ export const getBaseTheme = () => {
       addUsers: {
         iconColor: gray,
         arrowColor: darkBlack,
+        textColor: gray,
       },
 
       changeOwner: {
@@ -2479,6 +2484,8 @@ export const getBaseTheme = () => {
       upload: {
         color: gray,
         tooltipColor: lightToastInfo,
+        iconFill: gray,
+        textColor: gray,
 
         shareButton: {
           color: gray,
@@ -2490,6 +2497,9 @@ export const getBaseTheme = () => {
           background: white,
         },
       },
+      invite: {
+        textColor: gray,
+      },
     },
 
     menuItem: {
@@ -2640,6 +2650,7 @@ export const getBaseTheme = () => {
         stroke: grayStrong,
         color: grayStrong,
       },
+      commentColor: gray,
     },
 
     login: {
@@ -2788,6 +2799,7 @@ export const getBaseTheme = () => {
           loginHistory: {
             sideColor: gray,
             nameColor: black,
+            textColor: gray,
           },
         },
 
@@ -2828,8 +2840,9 @@ export const getBaseTheme = () => {
         integration: {
           separatorBorder: `1px solid ${grayStrong}`,
           linkColor: link,
-
+          textColor: gray,
           sso: {
+            textColor: gray,
             toggleContentBackground: grayLight,
             iconButton: black,
             iconButtonDisabled: gray,
@@ -2926,6 +2939,7 @@ export const getBaseTheme = () => {
       wizard: {
         linkColor: link,
         generatePasswordColor: lightGrayDark,
+        textColor: gray,
       },
     },
 
@@ -2978,6 +2992,9 @@ export const getBaseTheme = () => {
 
         mobileRowBackground: grayLight,
       },
+      login: {
+        textColor: gray,
+      },
       themePreview: {
         descriptionColor: gray,
         border: `1px solid ${grayLightMid}`,
diff --git a/packages/shared/themes/dark.ts b/packages/shared/themes/dark.ts
index 1f988bb76e..30c9c19abf 100644
--- a/packages/shared/themes/dark.ts
+++ b/packages/shared/themes/dark.ts
@@ -1897,6 +1897,10 @@ const Dark: TTheme = {
     search: {
       boxShadow: "0px 5px 20px 0px rgba(0, 0, 0, 0.16)",
     },
+
+    groups: {
+      textColor: grayDark,
+    },
   },
 
   filesArticleBody: {
@@ -2377,6 +2381,7 @@ const Dark: TTheme = {
     addUsers: {
       iconColor: gray,
       arrowColor: darkBlack,
+      textColor: grayDark,
     },
 
     changeOwner: {
@@ -2463,6 +2468,8 @@ const Dark: TTheme = {
     upload: {
       color: black,
       tooltipColor: darkToastInfo,
+      iconFill: grayDark,
+      textColor: grayDark,
 
       shareButton: {
         color: gray,
@@ -2474,6 +2481,9 @@ const Dark: TTheme = {
         background: black,
       },
     },
+    invite: {
+      textColor: grayDark,
+    },
   },
 
   menuItem: {
@@ -2624,6 +2634,7 @@ const Dark: TTheme = {
       stroke: white,
       color: white,
     },
+    commentColor: grayDark,
   },
 
   login: {
@@ -2772,6 +2783,7 @@ const Dark: TTheme = {
         loginHistory: {
           sideColor: grayDark,
           nameColor: white,
+          textColor: grayDark,
         },
       },
 
@@ -2812,8 +2824,9 @@ const Dark: TTheme = {
       integration: {
         separatorBorder: `1px solid ${grayDarkStrong}`,
         linkColor: darkLink,
-
+        textColor: grayDark,
         sso: {
+          textColor: grayDark,
           toggleContentBackground: grayDarkStrong,
           iconButton: white,
           iconButtonDisabled: black,
@@ -2907,6 +2920,7 @@ const Dark: TTheme = {
     wizard: {
       linkColor: darkLink,
       generatePasswordColor: darkGrayDark,
+      textColor: grayDark,
     },
   },
 
@@ -2959,6 +2973,9 @@ const Dark: TTheme = {
 
       mobileRowBackground: lightDarkGrayHover,
     },
+    login: {
+      textColor: grayDark,
+    },
     themePreview: {
       descriptionColor: darkGrayDark,
       border: `1px solid ${grayDarkStrong}`,