diff --git a/src/components/Language/LanguageSelector.tsx b/src/components/Language/LanguageSelector.tsx
index a51c715..e15727b 100644
--- a/src/components/Language/LanguageSelector.tsx
+++ b/src/components/Language/LanguageSelector.tsx
@@ -30,25 +30,18 @@ const LanguageSelector = () => {
   return (
     <Box ref={selectorRef}>
       {!showSelect && (
-        <Tooltip
-          key={currentLang}
-          title={t('core:action.change_language', {
+        <Button
+          onClick={() => setShowSelect(true)}
+          style={{
+            fontSize: '1.3rem',
+          }}
+          aria-label={t('core:current_language', {
+            language: name,
             postProcess: 'capitalizeFirstChar',
           })}
         >
-          <Button
-            onClick={() => setShowSelect(true)}
-            style={{
-              fontSize: '1.3rem',
-            }}
-            aria-label={t('core:current_language', {
-              language: name,
-              postProcess: 'capitalizeFirstChar',
-            })}
-          >
-            {flag}
-          </Button>
-        </Tooltip>
+          {flag}
+        </Button>
       )}
 
       {showSelect && (
diff --git a/src/components/Theme/ThemeSelector.tsx b/src/components/Theme/ThemeSelector.tsx
index 18fa5cc..6b6f880 100644
--- a/src/components/Theme/ThemeSelector.tsx
+++ b/src/components/Theme/ThemeSelector.tsx
@@ -19,26 +19,14 @@ const ThemeSelector = () => {
 
   return (
     <Box ref={selectorRef}>
-      <Tooltip
-        title={
-          themeMode === 'dark'
-            ? t('core:theme.light_mode', {
-                postProcess: 'capitalizeFirstChar',
-              })
-            : t('core:theme.dark_mode', {
-                postProcess: 'capitalizeFirstChar',
-              })
-        }
+      <IconButton
+        onClick={toggleTheme}
+        sx={{
+          color: theme.palette.text.secondary,
+        }}
       >
-        <IconButton
-          onClick={toggleTheme}
-          sx={{
-            color: theme.palette.text.secondary,
-          }}
-        >
-          {themeMode === 'dark' ? <LightModeIcon /> : <DarkModeIcon />}
-        </IconButton>
-      </Tooltip>
+        {themeMode === 'dark' ? <LightModeIcon /> : <DarkModeIcon />}
+      </IconButton>
     </Box>
   );
 };