diff --git a/src/App.tsx b/src/App.tsx
index cfefb34..0d0460a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1557,7 +1557,7 @@ function App() {
                       textTransform: 'uppercase',
                     }}
                   >
-                    {t('core:logout')}
+                    {t('core:action.logout')}
                   </span>
                 }
                 placement="left"
@@ -3585,7 +3585,7 @@ function App() {
                         I have read this request
                       </Typography>
                       <PriorityHighIcon color="warning" />
-                    </Box>
+                    </Box> // TODO translate
                   }
                 />
               )}
diff --git a/src/ExtStates/NotAuthenticated.tsx b/src/ExtStates/NotAuthenticated.tsx
index 2574f96..338a657 100644
--- a/src/ExtStates/NotAuthenticated.tsx
+++ b/src/ExtStates/NotAuthenticated.tsx
@@ -817,7 +817,7 @@ export const NotAuthenticated = ({
                         }}
                         variant="contained"
                       >
-                        {t('core:choose', { postProcess: 'capitalize' })}
+                        {t('core:action.choose', { postProcess: 'capitalize' })}
                       </Button>
                     </Box>
                   </Box>
@@ -876,7 +876,9 @@ export const NotAuthenticated = ({
                             }}
                             variant="contained"
                           >
-                            {t('core:choose', { postProcess: 'capitalize' })}
+                            {t('core:action.choose', {
+                              postProcess: 'capitalize',
+                            })}
                           </Button>
 
                           <Button
@@ -889,7 +891,9 @@ export const NotAuthenticated = ({
                             }}
                             variant="contained"
                           >
-                            {t('core:edit', { postProcess: 'capitalize' })}
+                            {t('core:action.edit', {
+                              postProcess: 'capitalize',
+                            })}
                           </Button>
 
                           <Button
@@ -941,7 +945,7 @@ export const NotAuthenticated = ({
           <DialogActions>
             {mode === 'list' && (
               <Button variant="contained" onClick={addCustomNode}>
-                {t('core:add', { postProcess: 'capitalize' })}
+                {t('core:action.add', { postProcess: 'capitalize' })}
               </Button>
             )}
 
@@ -954,7 +958,7 @@ export const NotAuthenticated = ({
                   }}
                   autoFocus
                 >
-                  {t('core:close', { postProcess: 'capitalize' })}
+                  {t('core:action.close', { postProcess: 'capitalize' })}
                 </Button>
               </>
             )}
@@ -1076,7 +1080,7 @@ export const NotAuthenticated = ({
                 setShowSelectApiKey(false);
               }}
             >
-              {t('core:close', { postProcess: 'capitalize' })}
+              {t('core:action.close', { postProcess: 'capitalize' })}
             </Button>
           </DialogActions>
         </Dialog>
diff --git a/src/components/QMailStatus.tsx b/src/components/QMailStatus.tsx
index dd6f9be..b733261 100644
--- a/src/components/QMailStatus.tsx
+++ b/src/components/QMailStatus.tsx
@@ -62,6 +62,7 @@ export const QMailStatus = () => {
               color: theme.palette.text.primary,
               fontSize: '14px',
               fontWeight: 700,
+              textTransform: 'uppercase',
             }}
           >
             {t('core:q_mail', {
diff --git a/src/components/Save/Save.tsx b/src/components/Save/Save.tsx
index f0fbc4f..3835c3e 100644
--- a/src/components/Save/Save.tsx
+++ b/src/components/Save/Save.tsx
@@ -569,7 +569,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                 }
               }}
             >
-              {t('core:import', {
+              {t('core:action.import', {
                 postProcess: 'capitalize',
               })}
             </ButtonBase>
@@ -594,7 +594,7 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                 }
               }}
             >
-              {t('core:export', {
+              {t('core:action.export', {
                 postProcess: 'capitalize',
               })}
             </ButtonBase>
diff --git a/src/components/Tutorials/Tutorials.tsx b/src/components/Tutorials/Tutorials.tsx
index 06274e7..522324f 100644
--- a/src/components/Tutorials/Tutorials.tsx
+++ b/src/components/Tutorials/Tutorials.tsx
@@ -91,7 +91,7 @@ export const Tutorials = () => {
         </DialogContent>
         <DialogActions>
           <Button variant="contained" onClick={handleClose}>
-            {t('core:close', { postProcess: 'capitalize' })}
+            {t('core:action.close', { postProcess: 'capitalize' })}
           </Button>
         </DialogActions>
       </Dialog>
@@ -138,7 +138,7 @@ export const Tutorials = () => {
 
         <DialogActions>
           <Button variant="contained" onClick={handleClose}>
-            {t('core:close', { postProcess: 'capitalize' })}
+            {t('core:action.close', { postProcess: 'capitalize' })}
           </Button>
         </DialogActions>
       </Dialog>