diff --git a/apps/phone/src/os/apps/config/apps.tsx b/apps/phone/src/os/apps/config/apps.tsx
index eab6a7799..bc382a5ef 100644
--- a/apps/phone/src/os/apps/config/apps.tsx
+++ b/apps/phone/src/os/apps/config/apps.tsx
@@ -34,7 +34,7 @@ import { SvgIconProps, Theme } from '@mui/material';
 import { INotificationIcon } from '@os/notifications/providers/NotificationsProvider';
 import { BrowserApp } from '@apps/browser/components/BrowserApp';
 import { MatchApp } from '@apps/match/components/MatchApp';
-import LifeInvaderContainer from '@apps/twitter/components/LifeInvaderContainer';
+import LifeInvaderContainer from '@apps/twitter/components/TwitterContainer';
 import { IPhoneSettings } from '@typings/settings';
 import { i18n } from 'i18next';
 import {
diff --git a/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx b/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx
index 60be4f968..9b5f9159e 100644
--- a/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx
+++ b/apps/phone/src/os/apps/icons/material/app/TWITTER.tsx
@@ -1,18 +1,8 @@
 import React from 'react';
-import { Twitter } from '@mui/icons-material';
+import { Twitter } from 'lucide-react';
 
 const TwitterIcon: React.FC = () => (
-  <svg width="40" height="40" viewBox="0 0 180 225" fill="none" xmlns="http://www.w3.org/2000/svg"
-       xlinkHref="http://www.w3.org/1999/xlink">
-    <rect width="225" height="225" fill="url(#pattern0)" />
-    <defs>
-      <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-        <use xlinkHref="#image0_6_17" transform="scale(0.00444444)" />
-      </pattern>
-      <image id="image0_6_17" width="225" height="225"
-             xlinkHref="data:image/png;base64,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" />
-    </defs>
-  </svg>
+  <Twitter size={30} />
 );
 
 export default TwitterIcon;
diff --git a/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx b/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx
index dc911aaa6..b0556b37f 100644
--- a/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx
+++ b/apps/phone/src/os/apps/icons/material/svg/TWITTER.tsx
@@ -1,18 +1,8 @@
 import React from 'react';
-import { Twitter } from '@mui/icons-material';
+import { Twitter } from 'lucide-react';
 
 const TwitterIcon: React.FC = () => (
-    <svg width="10" height="10" viewBox="0 0 180 225" fill="none" xmlns="http://www.w3.org/2000/svg"
-         xlinkHref="http://www.w3.org/1999/xlink">
-        <rect width="225" height="225" fill="url(#pattern0)"/>
-        <defs>
-            <pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-                <use xlinkHref="#image0_6_17" transform="scale(0.00444444)"/>
-            </pattern>
-            <image id="image0_6_17" width="225" height="225"
-                   xlinkHref="data:image/png;base64,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"/>
-        </defs>
-    </svg>
+    <Twitter size={16} />
 )
 
 export default TwitterIcon;
diff --git a/apps/phone/src/ui/components/AppIcon.tsx b/apps/phone/src/ui/components/AppIcon.tsx
index 69ef6c8e5..4fbd5f91a 100644
--- a/apps/phone/src/ui/components/AppIcon.tsx
+++ b/apps/phone/src/ui/components/AppIcon.tsx
@@ -15,7 +15,9 @@ const useStyles = makeStyles<Theme, { color: string; backgroundColor: string }>(
   },
   avatar: {
     '&:hover': {
-      backgroundColor: ({ backgroundColor }) => darken(backgroundColor, 0.1),
+      background: ({ backgroundColor }) => {
+        return `linear-gradient(45deg, ${darken(backgroundColor, 0.25)} 10%, ${backgroundColor} 90%)`;
+      },
     },
     background: ({ backgroundColor }) => {
       return `linear-gradient(45deg, ${darken(backgroundColor, 0.2)} 20%, ${backgroundColor} 90%)`;
@@ -66,7 +68,7 @@ export const AppIcon: React.FC<AppIconProps> = ({
   });
 
   return (
-    <Button disableTouchRipple disableRipple disableFocusRipple className={classes.root}>
+    <button className={classes.root}>
       <Badge
         color="error"
         badgeContent={notification?.badge}
@@ -78,6 +80,6 @@ export const AppIcon: React.FC<AppIconProps> = ({
           <div className={classes.avatar}>{icon || t(nameLocale)}</div>
         )}
       </Badge>
-    </Button>
+    </button>
   );
 };
diff --git a/apps/phone/src/ui/components/ContextMenu.tsx b/apps/phone/src/ui/components/ContextMenu.tsx
index bd20ca254..56ce31802 100644
--- a/apps/phone/src/ui/components/ContextMenu.tsx
+++ b/apps/phone/src/ui/components/ContextMenu.tsx
@@ -35,27 +35,30 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({
       mountOnEnter
       unmountOnExit
     >
-      <div className="min-h-10%] z-[9999] max-h-full w-full overflow-auto rounded-t-2xl border-t border-neutral-800 bg-neutral-100 dark:bg-neutral-900 p-2 text-white">
+      <div className="z-[9999] max-h-[70%] max-h-full min-h-[10%] w-full overflow-hidden rounded-t-2xl border-t border-neutral-800 bg-neutral-100 p-2 text-white dark:bg-neutral-900">
         <div className="flex items-center justify-between px-2">
-          <p className="text-base font-medium text-neutral-900 dark:text-neutral-50">{settingLabel}</p>
-          <button onClick={onClose} className="dark:text-neutral-50 text-neutral-900">
+          <p className="text-base font-medium text-neutral-900 dark:text-neutral-50">
+            {settingLabel}
+          </p>
+          <button onClick={onClose} className="text-neutral-900 dark:text-neutral-50">
             <X size={24} />
           </button>
         </div>
-        <List>
-          {_options.map((option) => (
-            <ListItem
-              startElement={option.icon}
-              primaryText={option.label}
-              secondaryText={option.description}
-              button
-              selected={option.selected}
-              onClick={(e) => {
-                option.onClick(e, option);
-                onClose();
-              }}
-            />
-            /*  <ListItem
+        <div className="overflow-auto max-h-[500px] pb-4">
+          <List>
+            {_options.map((option) => (
+              <ListItem
+                startElement={option.icon}
+                primaryText={option.label}
+                secondaryText={option.description}
+                button
+                selected={option.selected}
+                onClick={(e) => {
+                  option.onClick(e, option);
+                  onClose();
+                }}
+              />
+              /*  <ListItem
               selected={option.selected}
               key={option.key || option.label}
               button
@@ -67,8 +70,9 @@ export const ContextMenu: React.FC<ContextMenuProps> = ({
               {option.icon && <ListItemIcon>{option.icon}</ListItemIcon>}
               <ListItemText primary={option.label} secondary={option.description} />
             </ListItem> */
-          ))}
-        </List>
+            ))}
+          </List>
+        </div>
       </div>
     </Slide>
   );