diff --git a/src/components/Apps/AppsCategoryDesktop.tsx b/src/components/Apps/AppsCategoryDesktop.tsx
index bd52a53..4c4a541 100644
--- a/src/components/Apps/AppsCategoryDesktop.tsx
+++ b/src/components/Apps/AppsCategoryDesktop.tsx
@@ -145,7 +145,9 @@ export const AppsCategoryDesktop = ({
                   postProcess: 'capitalizeFirstChar',
                 })}
                 inputProps={{
-                  'aria-label': 'Search for apps',
+                  'aria-label': t('core:action.search_apps', {
+                    postProcess: 'capitalizeFirstChar',
+                  }),
                   fontSize: '16px',
                   fontWeight: 400,
                 }}
diff --git a/src/components/Chat/ChatOptions.tsx b/src/components/Chat/ChatOptions.tsx
index a79a4a2..f4dfb9c 100644
--- a/src/components/Chat/ChatOptions.tsx
+++ b/src/components/Chat/ChatOptions.tsx
@@ -426,7 +426,9 @@ export const ChatOptions = ({
                   postProcess: 'capitalizeFirstChar',
                 })}
                 inputProps={{
-                  'aria-label': 'Search for apps',
+                  'aria-label': t('core:action.search_apps', {
+                    postProcess: 'capitalizeFirstChar',
+                  }),
                   fontSize: '16px',
                   fontWeight: 400,
                 }}
diff --git a/src/components/Group/AddGroup.tsx b/src/components/Group/AddGroup.tsx
index 2028dea..1916aaa 100644
--- a/src/components/Group/AddGroup.tsx
+++ b/src/components/Group/AddGroup.tsx
@@ -433,7 +433,7 @@ export const AddGroup = ({ address, open, setOpen }) => {
                     }}
                   >
                     <Label>
-                      {t('group:approval_threshold', {
+                      {t('group:message.generic.group_approval_threshold', {
                         postProcess: 'capitalizeFirstChar',
                       })}
                     </Label>
@@ -442,7 +442,9 @@ export const AddGroup = ({ address, open, setOpen }) => {
                       labelId="demo-simple-select-label"
                       id="demo-simple-select"
                       value={approvalThreshold}
-                      label="Group Approval Threshold"
+                      label={t('group:group.approval_threshold', {
+                        postProcess: 'capitalizeFirstChar',
+                      })}
                       onChange={handleChangeApprovalThreshold}
                     >
                       <MenuItem value={0}>
diff --git a/src/components/Group/AddGroupList.tsx b/src/components/Group/AddGroupList.tsx
index 64c4b3b..eaa7f4d 100644
--- a/src/components/Group/AddGroupList.tsx
+++ b/src/components/Group/AddGroupList.tsx
@@ -312,9 +312,15 @@ export const AddGroupList = ({ setInfoSnack, setOpenSnack }) => {
         flexGrow: 1,
       }}
     >
-      <p>Groups list</p>
+      <p>
+        {t('core:list.groups', {
+          postProcess: 'capitalizeFirstChar',
+        })}
+      </p>
       <TextField
-        label="Search for Groups"
+        label={t('core:action.search_groups', {
+          postProcess: 'capitalizeFirstChar',
+        })}
         variant="outlined"
         fullWidth
         value={inputValue}
diff --git a/src/components/Group/ListOfGroupPromotions.tsx b/src/components/Group/ListOfGroupPromotions.tsx
index b2f22fb..bf6ba8b 100644
--- a/src/components/Group/ListOfGroupPromotions.tsx
+++ b/src/components/Group/ListOfGroupPromotions.tsx
@@ -921,7 +921,9 @@ export const ListOfGroupPromotions = () => {
           <Spacer height="20px" />
 
           <TextField
-            label="Promotion text"
+            label={t('core:promotion_text', {
+              postProcess: 'capitalizeFirstChar',
+            })}
             variant="filled"
             fullWidth
             value={text}
diff --git a/src/components/Group/ManageMembers.tsx b/src/components/Group/ManageMembers.tsx
index 58ef33b..e64eeab 100644
--- a/src/components/Group/ManageMembers.tsx
+++ b/src/components/Group/ManageMembers.tsx
@@ -254,7 +254,9 @@ export const ManageMembers = ({
               }}
             >
               <Tab
-                label="List of members"
+                label={t('core:list.members', {
+                  postProcess: 'capitalizeFirstChar',
+                })}
                 {...a11yProps(0)}
                 sx={{
                   '&.Mui-selected': {
@@ -265,7 +267,9 @@ export const ManageMembers = ({
               />
 
               <Tab
-                label="Invite new member"
+                label={t('core:action.invite_member', {
+                  postProcess: 'capitalizeFirstChar',
+                })}
                 {...a11yProps(1)}
                 sx={{
                   '&.Mui-selected': {
@@ -276,7 +280,9 @@ export const ManageMembers = ({
               />
 
               <Tab
-                label="List of invites"
+                label={t('core:list.invites', {
+                  postProcess: 'capitalizeFirstChar',
+                })}
                 {...a11yProps(2)}
                 sx={{
                   '&.Mui-selected': {
@@ -287,7 +293,9 @@ export const ManageMembers = ({
               />
 
               <Tab
-                label="List of bans"
+                label={t('core:list.bans', {
+                  postProcess: 'capitalizeFirstChar',
+                })}
                 {...a11yProps(3)}
                 sx={{
                   '&.Mui-selected': {
@@ -298,7 +306,9 @@ export const ManageMembers = ({
               />
 
               <Tab
-                label="Join requests"
+                label={t('group:join_requests', {
+                  postProcess: 'capitalizeFirstChar',
+                })}
                 {...a11yProps(4)}
                 sx={{
                   '&.Mui-selected': {
diff --git a/src/components/Theme/ThemeManager.tsx b/src/components/Theme/ThemeManager.tsx
index b8a51f6..69c63c9 100644
--- a/src/components/Theme/ThemeManager.tsx
+++ b/src/components/Theme/ThemeManager.tsx
@@ -316,8 +316,18 @@ export default function ThemeManager() {
             onChange={(e, newValue) => setCurrentTab(newValue)}
             sx={{ mt: 2, mb: 2 }}
           >
-            <Tab label="Light" value="light" />
-            <Tab label="Dark" value="dark" />
+            <Tab
+              label={t('core:theme.light', {
+                postProcess: 'capitalizeFirstChar',
+              })}
+              value="light"
+            />
+            <Tab
+              label={t('core:theme.dark', {
+                postProcess: 'capitalizeFirstChar',
+              })}
+              value="dark"
+            />
           </Tabs>
 
           <Box>
@@ -412,6 +422,7 @@ export default function ThemeManager() {
           <Button onClick={() => setOpenEditor(false)}>
             {t('core:action.cancel', { postProcess: 'capitalizeFirstChar' })}
           </Button>
+
           <Button
             disabled={!themeDraft.name}
             onClick={handleSaveTheme}
diff --git a/src/components/Theme/ThemeSelector.tsx b/src/components/Theme/ThemeSelector.tsx
index 97aa06d..dd0dbba 100644
--- a/src/components/Theme/ThemeSelector.tsx
+++ b/src/components/Theme/ThemeSelector.tsx
@@ -6,7 +6,6 @@ import { useTranslation } from 'react-i18next';
 
 const ThemeSelector = () => {
   const { t } = useTranslation(['auth', 'core', 'group']);
-
   const { themeMode, toggleTheme } = useThemeContext();
 
   return (
@@ -22,10 +21,10 @@ const ThemeSelector = () => {
       <Tooltip
         title={
           themeMode === 'dark'
-            ? t('core:theme.light', {
+            ? t('core:theme.light_mode', {
                 postProcess: 'capitalizeFirstChar',
               })
-            : t('core:theme.light', {
+            : t('core:theme.dark_mode', {
                 postProcess: 'capitalizeFirstChar',
               })
         }
diff --git a/src/i18n/locales/en/core.json b/src/i18n/locales/en/core.json
index 954b754..50fb40d 100644
--- a/src/i18n/locales/en/core.json
+++ b/src/i18n/locales/en/core.json
@@ -43,6 +43,7 @@
     "import": "import",
     "import_theme": "import theme",
     "invite": "invite",
+    "invite_member": "invite new member",
     "join": "join",
     "leave_comment": "leave comment",
     "load_announcements": "load older announcements",
@@ -72,6 +73,7 @@
     "save_disk": "save to disk",
     "search": "search",
     "search_apps": "search for apps",
+    "search_groups": "search for groups",
     "search_chat_text": "search chat text",
     "select_app_type": "select App Type",
     "select_category": "select Category",
@@ -147,9 +149,13 @@
   "level": "level",
   "library": "library",
   "list": {
+    "bans": "list of bans",
+    "groups": "list of groups",
     "invite": "invite list",
+    "invites": "list of invites",
     "join_request": "join request list",
-    "member": "member list"
+    "member": "member list",
+    "members": "list of members"
   },
   "loading": {
     "announcements": "loading announcements",
@@ -264,6 +270,7 @@
       "updating": "updating"
     },
     "message": "message",
+    "promotion_text": "Promotion text",
     "question": {
       "accept_vote_on_poll": "do you accept this VOTE_ON_POLL transaction? POLLS are public!",
       "logout": "are you sure you would like to logout?",
@@ -333,8 +340,10 @@
   "supply": "supply",
   "tags": "tags",
   "theme": {
-    "dark": "dark mode",
-    "light": "light mode",
+    "dark": "dark",
+    "dark_mode": "dark mode",
+    "light": "light",
+    "light_mode": "light mode",
     "manager": "theme Manager",
     "name": "theme name"
   },
diff --git a/src/i18n/locales/en/group.json b/src/i18n/locales/en/group.json
index e96466a..2bd0552 100644
--- a/src/i18n/locales/en/group.json
+++ b/src/i18n/locales/en/group.json
@@ -29,13 +29,13 @@
     "visit_q_mintership": "visit Q-Mintership"
   },
   "advanced_options": "advanced options",
-  "approval_threshold": "group Approval Threshold (number / percentage of Admins that must approve a transaction)",
   "ban_list": "ban list",
   "block_delay": {
     "minimum": "Minimum Block delay",
     "maximum": "Maximum Block delay"
   },
   "group": {
+    "approval_threshold": "group Approval Threshold",
     "avatar": "group avatar",
     "closed": "closed (private) - users need permission to join",
     "description": "description of group",
@@ -73,6 +73,7 @@
       "descrypt_wallet": "decrypting wallet...",
       "encryption_key": "the group's first common encryption key is in the process of creation. Please wait a few minutes for it to be retrieved by the network. Checking every 2 minutes...",
       "group_announcement": "group Announcements",
+      "group_approval_threshold": "group Approval Threshold (number / percentage of Admins that must approve a transaction)",
       "group_encrypted": "group encrypted",
       "group_invited_you": "{{group}} has invited you",
       "group_key_created": "first group key created.",