diff --git a/src/App.tsx b/src/App.tsx
index 7ae6df1..9b69315 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3966,7 +3966,7 @@ function App() {
             bottom: '1%',
             display: 'flex',
             flexDirection: 'column',
-            left: '1%',
+            left: '3px',
             position: 'absolute',
             width: 'auto',
           }}
diff --git a/src/components/Apps/AppsDesktop.tsx b/src/components/Apps/AppsDesktop.tsx
index 5297e59..98dfe6d 100644
--- a/src/components/Apps/AppsDesktop.tsx
+++ b/src/components/Apps/AppsDesktop.tsx
@@ -25,6 +25,8 @@ import { CoreSyncStatus } from '../CoreSyncStatus';
 import { MessagingIconFilled } from '../../assets/Icons/MessagingIconFilled';
 import { useAtom } from 'jotai';
 import { useTranslation } from 'react-i18next';
+import LanguageSelector from '../Language/LanguageSelector';
+import ThemeSelector from '../Theme/ThemeSelector';
 
 const uid = new ShortUniqueId({ length: 8 });
 
@@ -457,6 +459,7 @@ export const AppsDesktop = ({
             </IconWrapper>
           </ButtonBase>
         )}
+
         {mode !== 'home' && (
           <AppsNavBarDesktop
             disableBack={isNewTabWindow && mode === 'viewer'}
@@ -499,6 +502,7 @@ export const AppsDesktop = ({
       {mode === 'appInfo' && !selectedTab && (
         <AppInfo app={selectedAppInfo} myName={myName} />
       )}
+
       {mode === 'appInfo-from-category' && !selectedTab && (
         <AppInfo app={selectedAppInfo} myName={myName} />
       )}
@@ -553,6 +557,26 @@ export const AppsDesktop = ({
           </Box>
         </>
       )}
+
+      <Box
+        sx={{
+          alignItems: 'flex-start',
+          bottom: '1%',
+          display: 'flex',
+          flexDirection: 'column',
+          left: '3px',
+          position: 'absolute',
+          width: 'auto',
+        }}
+      >
+        <Box sx={{ alignSelf: 'left' }}>
+          <LanguageSelector />
+        </Box>
+
+        <Box sx={{ alignSelf: 'center' }}>
+          <ThemeSelector />
+        </Box>
+      </Box>
     </AppsParent>
   );
 };
diff --git a/src/components/Apps/AppsDevMode.tsx b/src/components/Apps/AppsDevMode.tsx
index 7d90e0b..9881157 100644
--- a/src/components/Apps/AppsDevMode.tsx
+++ b/src/components/Apps/AppsDevMode.tsx
@@ -18,6 +18,8 @@ import { IconWrapper } from '../Desktop/DesktopFooter';
 import { CoreSyncStatus } from '../CoreSyncStatus';
 import { MessagingIconFilled } from '../../assets/Icons/MessagingIconFilled';
 import { useTranslation } from 'react-i18next';
+import LanguageSelector from '../Language/LanguageSelector';
+import ThemeSelector from '../Theme/ThemeSelector';
 
 const uid = new ShortUniqueId({ length: 8 });
 
@@ -351,6 +353,24 @@ export const AppsDevMode = ({
         </ButtonBase>
 
         {mode !== 'home' && <AppsDevModeNavBar />}
+        <Box
+          sx={{
+            alignItems: 'flex-start',
+            bottom: '1%',
+            display: 'flex',
+            flexDirection: 'column',
+            position: 'absolute',
+            width: 'auto',
+          }}
+        >
+          <Box sx={{ alignSelf: 'left' }}>
+            <LanguageSelector />
+          </Box>
+
+          <Box sx={{ alignSelf: 'center' }}>
+            <ThemeSelector />
+          </Box>
+        </Box>
       </Box>
 
       {mode === 'home' && (
diff --git a/src/components/Apps/AppsDevModeNavBar.tsx b/src/components/Apps/AppsDevModeNavBar.tsx
index a720a75..0bfc0c9 100644
--- a/src/components/Apps/AppsDevModeNavBar.tsx
+++ b/src/components/Apps/AppsDevModeNavBar.tsx
@@ -35,7 +35,6 @@ export const AppsDevModeNavBar = () => {
   const [isNewTabWindow, setIsNewTabWindow] = useState(false);
   const tabsRef = useRef(null);
   const [anchorEl, setAnchorEl] = useState(null);
-  const open = Boolean(anchorEl);
 
   const handleClick = (event) => {
     setAnchorEl(event.currentTarget);
diff --git a/src/components/Apps/AppsHomeDesktop.tsx b/src/components/Apps/AppsHomeDesktop.tsx
index 5352692..28edd64 100644
--- a/src/components/Apps/AppsHomeDesktop.tsx
+++ b/src/components/Apps/AppsHomeDesktop.tsx
@@ -14,8 +14,6 @@ import { SortablePinnedApps } from './SortablePinnedApps';
 import { extractComponents } from '../Chat/MessageDisplay';
 import ArrowOutwardIcon from '@mui/icons-material/ArrowOutward';
 import { AppsPrivate } from './AppsPrivate';
-import ThemeSelector from '../Theme/ThemeSelector';
-import LanguageSelector from '../Language/LanguageSelector';
 import { useTranslation } from 'react-i18next';
 
 export const AppsHomeDesktop = ({
@@ -169,26 +167,6 @@ export const AppsHomeDesktop = ({
           myApp={myApp}
         />
       </AppsContainer>
-
-      <Box
-        sx={{
-          alignItems: 'flex-start',
-          bottom: '1%',
-          display: 'flex',
-          flexDirection: 'column',
-          left: '4px',
-          position: 'absolute',
-          width: 'auto',
-        }}
-      >
-        <Box sx={{ alignSelf: 'left' }}>
-          <LanguageSelector />
-        </Box>
-
-        <Box sx={{ alignSelf: 'center' }}>
-          <ThemeSelector />
-        </Box>
-      </Box>
     </>
   );
 };