diff --git a/apps/mobile/app/components/HamburgerMenu.tsx b/apps/mobile/app/components/HamburgerMenu.tsx
index 99fd8b516..c02cd21c4 100644
--- a/apps/mobile/app/components/HamburgerMenu.tsx
+++ b/apps/mobile/app/components/HamburgerMenu.tsx
@@ -91,7 +91,7 @@ const HamburgerMenu = observer((props: any) => {
 								marginTop: 4,
 							}}
 						>
-							{user?.email}s
+							{user?.email}
 						</Text>
 						{activeTeam ? (
 							<DropDown
diff --git a/apps/mobile/app/components/TaskPriority.tsx b/apps/mobile/app/components/TaskPriority.tsx
index f8c35631b..b2417d3d8 100644
--- a/apps/mobile/app/components/TaskPriority.tsx
+++ b/apps/mobile/app/components/TaskPriority.tsx
@@ -52,7 +52,7 @@ const TaskPriority: FC<TaskPriorityProps> = observer(
 		return (
 			<>
 				<TaskPriorityPopup
-					priorityName={task?.priority}
+					priorityName={task ? task?.priority : priority}
 					visible={openModal}
 					setSelectedPriority={(e) => onChangePriority(e.value)}
 					onDismiss={() => setOpenModal(false)}
@@ -81,7 +81,11 @@ const TaskPriority: FC<TaskPriorityProps> = observer(
 								</Text>
 							</View>
 						)}
-						<AntDesign name="down" size={14} color={colors.primary} />
+						<AntDesign
+							name="down"
+							size={14}
+							color={task?.priority || priority ? "#000000" : colors.primary}
+						/>
 					</View>
 				</TouchableOpacity>
 			</>
diff --git a/apps/mobile/app/components/TaskSize.tsx b/apps/mobile/app/components/TaskSize.tsx
index 56aa7ee0d..b5c71b279 100644
--- a/apps/mobile/app/components/TaskSize.tsx
+++ b/apps/mobile/app/components/TaskSize.tsx
@@ -88,7 +88,11 @@ const TaskSize: FC<TaskSizeProps> = observer(({ task, containerStyle, setSize, s
 							</Text>
 						</View>
 					)}
-					<AntDesign name="down" size={14} color={colors.primary} />
+					<AntDesign
+						name="down"
+						size={14}
+						color={task?.size || size ? "#000000" : colors.primary}
+					/>
 				</View>
 			</TouchableOpacity>
 		</>
diff --git a/apps/mobile/app/components/TaskSizePopup.tsx b/apps/mobile/app/components/TaskSizePopup.tsx
index 333a8f1fd..b315b0db7 100644
--- a/apps/mobile/app/components/TaskSizePopup.tsx
+++ b/apps/mobile/app/components/TaskSizePopup.tsx
@@ -103,6 +103,7 @@ interface ItemProps {
 const Item: FC<ItemProps> = ({ currentSizeName, size, onSizeSelected }) => {
 	const { colors } = useAppTheme()
 	const selected = size.value === currentSizeName
+
 	return (
 		<TouchableOpacity onPress={() => onSizeSelected(size)}>
 			<View style={{ ...styles.wrapperItem, borderColor: colors.border }}>
diff --git a/apps/mobile/app/components/TaskStatus.tsx b/apps/mobile/app/components/TaskStatus.tsx
index e0f487b20..05cd52b86 100644
--- a/apps/mobile/app/components/TaskStatus.tsx
+++ b/apps/mobile/app/components/TaskStatus.tsx
@@ -54,7 +54,7 @@ const TaskStatus: FC<TaskStatusProps> = observer(
 		return (
 			<>
 				<TaskStatusPopup
-					statusName={task?.status}
+					statusName={task ? task?.status : status}
 					visible={openModal}
 					setSelectedStatus={(e) => onChangeStatus(e)}
 					onDismiss={() => setOpenModal(false)}
@@ -90,7 +90,11 @@ const TaskStatus: FC<TaskStatusProps> = observer(
 								)}
 							</Text>
 						)}
-						<AntDesign name="down" size={14} color={colors.primary} />
+						<AntDesign
+							name="down"
+							size={14}
+							color={task?.status || status ? "#000000" : colors.primary}
+						/>
 					</View>
 				</TouchableOpacity>
 			</>
diff --git a/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx b/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
index 5ffc9598a..9a417987d 100644
--- a/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
+++ b/apps/mobile/app/components/TeamDropdown/DropDownSection.tsx
@@ -16,6 +16,7 @@ import { Avatar } from "react-native-paper"
 import { observer } from "mobx-react-lite"
 import { limitTextCharaters } from "../../helpers/sub-text"
 import { useNavigation } from "@react-navigation/native"
+import { FlatList } from "react-native-gesture-handler"
 
 export interface Props {
 	teams: IOrganizationTeamList[]
@@ -73,15 +74,28 @@ const DropDownSection: FC<Props> = observer(function DropDownSection({
 			{activeTeamId && (
 				<DropItem resized={resized} team={activeTeam} changeTeam={changeTeam} isActiveTeam={true} />
 			)}
-			{others.map((item, index) => (
-				<DropItem
-					key={index}
-					team={item}
-					resized={resized}
-					changeTeam={changeTeam}
-					isActiveTeam={false}
-				/>
-			))}
+
+			<FlatList
+				data={others}
+				scrollEnabled={false}
+				renderItem={({ item, index }) => (
+					<View
+						style={{
+							width: resized ? "100%" : "90%",
+							justifyContent: "center",
+							alignItems: "center",
+						}}
+					>
+						<DropItem
+							key={index}
+							team={item}
+							resized={resized}
+							changeTeam={changeTeam}
+							isActiveTeam={false}
+						/>
+					</View>
+				)}
+			/>
 			<TouchableOpacity
 				style={{ width: "90%", opacity: isAccountVerified ? 1 : 0.5 }}
 				onPress={() => onCreateTeam()}
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx
index c21eca66d..4046a53cc 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/ListCardItem.tsx
@@ -258,7 +258,7 @@ const ListCardItem: React.FC<Props> = (props) => {
 	return (
 		<Card
 			style={[
-				{ borderRadius: 14, ...GS.shadow },
+				styles.cardContainer,
 				!dark && activeAuthTask && { borderColor: "#8C7AE4", borderWidth: 3 },
 			]}
 		>
@@ -285,6 +285,14 @@ const ListCardItem: React.FC<Props> = (props) => {
 export default ListCardItem
 
 const styles = StyleSheet.create({
+	cardContainer: {
+		borderRadius: 14,
+		elevation: 24,
+		shadowColor: "#000",
+		shadowOffset: { width: 0, height: 12 },
+		shadowOpacity: 0.05,
+		shadowRadius: 5,
+	},
 	dropdownTxt: {
 		color: "#282048",
 		fontFamily: typography.primary.semiBold,
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskLabelFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskLabelFilter.tsx
index e6ed5e7c6..ba70a1d25 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskLabelFilter.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskLabelFilter.tsx
@@ -7,11 +7,11 @@ import {
 	Text,
 	StyleSheet,
 	ViewStyle,
-	ScrollView,
 	Dimensions,
 	Animated,
 	Modal,
 	TouchableWithoutFeedback,
+	FlatList,
 } from "react-native"
 import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
 import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
@@ -92,16 +92,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
 					>
 						<View style={styles.secondContainer}>
 							<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
-							<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
-								{allTaskLabels.map((item, idx) => (
-									<DropDownItem
-										selectedLabels={selectedLabels}
-										setSelectedLabels={setSelectedLabels}
-										label={item}
-										key={idx}
-									/>
-								))}
-							</ScrollView>
+							<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
+								<FlatList
+									bounces={false}
+									showsVerticalScrollIndicator={false}
+									data={allTaskLabels}
+									renderItem={({ item, index }) => (
+										<DropDownItem
+											selectedLabels={selectedLabels}
+											setSelectedLabels={setSelectedLabels}
+											label={item}
+											key={index}
+										/>
+									)}
+								/>
+							</View>
 						</View>
 					</View>
 				</TouchableWithoutFeedback>
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskPriorityFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskPriorityFilter.tsx
index 8409e1723..670fbfd5e 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskPriorityFilter.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskPriorityFilter.tsx
@@ -7,11 +7,11 @@ import {
 	Text,
 	StyleSheet,
 	ViewStyle,
-	ScrollView,
 	Dimensions,
 	Animated,
 	Modal,
 	TouchableWithoutFeedback,
+	FlatList,
 } from "react-native"
 import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
 import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
@@ -99,16 +99,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
 					>
 						<View style={styles.secondContainer}>
 							<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
-							<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
-								{allTaskPriorities.map((item, idx) => (
-									<DropDownItem
-										selectedPriorities={selectedPriorities}
-										setSelectedPriorities={setSelectedPriorities}
-										priority={item}
-										key={idx}
-									/>
-								))}
-							</ScrollView>
+							<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
+								<FlatList
+									bounces={false}
+									showsVerticalScrollIndicator={false}
+									data={allTaskPriorities}
+									renderItem={({ item, index }) => (
+										<DropDownItem
+											selectedPriorities={selectedPriorities}
+											setSelectedPriorities={setSelectedPriorities}
+											priority={item}
+											key={index}
+										/>
+									)}
+								/>
+							</View>
 						</View>
 					</View>
 				</TouchableWithoutFeedback>
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskSizeFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskSizeFilter.tsx
index c22687a57..4a160b4f2 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskSizeFilter.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskSizeFilter.tsx
@@ -7,11 +7,11 @@ import {
 	Text,
 	StyleSheet,
 	ViewStyle,
-	ScrollView,
 	Dimensions,
 	Animated,
 	Modal,
 	TouchableWithoutFeedback,
+	FlatList,
 } from "react-native"
 import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
 import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
@@ -92,16 +92,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
 					>
 						<View style={styles.secondContainer}>
 							<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
-							<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
-								{allTaskSizes.map((item, idx) => (
-									<DropDownItem
-										selectedSizes={selectedSizes}
-										setSelectedSizes={setSelectedSizes}
-										size={item}
-										key={idx}
-									/>
-								))}
-							</ScrollView>
+							<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
+								<FlatList
+									bounces={false}
+									showsVerticalScrollIndicator={false}
+									data={allTaskSizes}
+									renderItem={({ item, index }) => (
+										<DropDownItem
+											selectedSizes={selectedSizes}
+											setSelectedSizes={setSelectedSizes}
+											size={item}
+											key={index}
+										/>
+									)}
+								/>
+							</View>
 						</View>
 					</View>
 				</TouchableWithoutFeedback>
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskStatusFilter.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskStatusFilter.tsx
index 9bb18b6a0..38098a788 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskStatusFilter.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TaskStatusFilter.tsx
@@ -7,11 +7,11 @@ import {
 	Text,
 	StyleSheet,
 	ViewStyle,
-	ScrollView,
 	Dimensions,
 	Animated,
 	Modal,
 	TouchableWithoutFeedback,
+	FlatList,
 } from "react-native"
 import { AntDesign, Feather, FontAwesome } from "@expo/vector-icons"
 import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
@@ -93,16 +93,21 @@ const TaskStatusFilterDropDown: FC<DropDownProps> = observer(
 					>
 						<View style={styles.secondContainer}>
 							<Text style={[styles.dropdownTitle, { color: colors.primary }]}>Statuses</Text>
-							<ScrollView bounces={false} style={{ paddingHorizontal: 16, height: height / 2.55 }}>
-								{allStatuses.map((item, idx) => (
-									<DropDownItem
-										selectedStatus={selectedStatus}
-										setSelectedStatus={setSelectedStatus}
-										status={item}
-										key={idx}
-									/>
-								))}
-							</ScrollView>
+							<View style={{ paddingHorizontal: 16, height: height / 2.55 }}>
+								<FlatList
+									bounces={false}
+									showsVerticalScrollIndicator={false}
+									data={allStatuses}
+									renderItem={({ item, index }) => (
+										<DropDownItem
+											selectedStatus={selectedStatus}
+											setSelectedStatus={setSelectedStatus}
+											status={item}
+											key={index}
+										/>
+									)}
+								/>
+							</View>
 						</View>
 					</View>
 				</TouchableWithoutFeedback>
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx
index 0172c68b1..8e2837384 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/TimerButton.tsx
@@ -82,7 +82,7 @@ const styles = StyleSheet.create({
 	shadowTimerNotRunning: {
 		elevation: 10,
 		shadowColor: "#3826A6",
-		shadowOffset: { width: 0, height: 10 },
+		shadowOffset: { width: 0, height: 8 },
 		shadowOpacity: 0.5,
 		shadowRadius: 10,
 	},
diff --git a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx
index 31d479c6a..cac54450f 100644
--- a/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx
+++ b/apps/mobile/app/screens/Authenticated/ProfileScreen/components/UserProfileTasks.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
-import { Dimensions, ScrollView, Text, TextStyle, View } from "react-native"
+import { Dimensions, FlatList, ScrollView, Text, TextStyle, View } from "react-native"
 import React, { FC, useMemo } from "react"
 import { IUserProfile } from "../logics/useProfileScreenLogic"
 import { ITaskFilter } from "../../../../services/hooks/features/useTaskFilters"
@@ -27,143 +27,170 @@ const UserProfileTasks: FC<IUserProfileTasks> = observer(({ profile, content })
 	}, [content, profile])
 
 	return (
-		<ScrollView
-			style={{
-				flex: 1,
-				paddingHorizontal: 20,
-				backgroundColor: dark ? "rgb(16,17,20)" : colors.background2,
-			}}
-			bounces={false}
-		>
-			{content.tab === "worked" &&
-			profile.activeUserTeamTask &&
-			(profile.member?.timerStatus === "running" ||
-				(profile.isAuthUser && timerStatus?.running)) ? (
-				<>
-					<View
-						style={{
-							flexDirection: "row",
-							justifyContent: "space-between",
-							marginVertical: 20,
-						}}
-					>
-						<Text style={[$textLabel, { color: colors.primary }]}>
-							{translate("tasksScreen.now")}
-						</Text>
-						<View
-							style={{
-								width: width / 1.8,
-								alignSelf: "center",
-								borderBottomWidth: 1,
-								borderBottomColor: colors.border,
-							}}
-						/>
-						<View style={{ flexDirection: "row", alignItems: "center" }}>
-							<Text
+		<>
+			{content.tab === "worked" && (
+				<ScrollView
+					style={{
+						flex: 1,
+						paddingHorizontal: 20,
+						backgroundColor: dark ? "rgb(16,17,20)" : colors.background2,
+					}}
+					bounces={false}
+				>
+					{content.tab === "worked" &&
+					profile.activeUserTeamTask &&
+					(profile.member?.timerStatus === "running" ||
+						(profile.isAuthUser && timerStatus?.running)) ? (
+						<>
+							<View
 								style={{
-									color: colors.primary,
-									fontSize: 12,
-									fontFamily: typography.secondary.medium,
+									flexDirection: "row",
+									justifyContent: "space-between",
+									marginVertical: 20,
 								}}
 							>
-								{translate("tasksScreen.totalTimeLabel")}:
-							</Text>
-							<Text
-								style={[
-									$textLabel,
-									{
-										marginLeft: 5,
-										color: colors.primary,
-										fontFamily: typography.primary.semiBold,
-										fontSize: 12,
-									},
-								]}
-							></Text>
-							<WorkedOnTaskHours
-								memberTask={profile.activeUserTeamTask}
-								containerStyle={{ alignItems: "center" }}
-								totalTimeText={{ color: colors.primary, fontSize: 12 }}
-							/>
-						</View>
-					</View>
-					<ListCardItem
-						task={profile.activeUserTeamTask}
-						isAuthUser={profile.isAuthUser}
-						isAssigned={true}
-						activeAuthTask={true}
-						profile={profile}
-					/>
-				</>
-			) : null}
-
-			{content.tab === "worked" && (
-				<View>
-					<View
-						style={{
-							flexDirection: "row",
-							justifyContent: "space-between",
-							marginVertical: 20,
-						}}
-					>
-						<Text style={[$textLabel, { color: colors.primary }]}>
-							{translate("tasksScreen.last24hours")} ({tasks.length})
-						</Text>
-						<View
-							style={{
-								width: width / 1.5,
-								alignSelf: "center",
-								top: 3,
-								borderBottomWidth: 1,
-								borderBottomColor: colors.border,
-							}}
-						/>
-					</View>
-					{tasks.map((task, index) => (
-						<View key={index.toString()} style={{ ...GS.mb4 }}>
+								<Text style={[$textLabel, { color: colors.primary }]}>
+									{translate("tasksScreen.now")}
+								</Text>
+								<View
+									style={{
+										width: width / 1.8,
+										alignSelf: "center",
+										borderBottomWidth: 1,
+										borderBottomColor: colors.border,
+									}}
+								/>
+								<View style={{ flexDirection: "row", alignItems: "center" }}>
+									<Text
+										style={{
+											color: colors.primary,
+											fontSize: 12,
+											fontFamily: typography.secondary.medium,
+										}}
+									>
+										{translate("tasksScreen.totalTimeLabel")}:
+									</Text>
+									<Text
+										style={[
+											$textLabel,
+											{
+												marginLeft: 5,
+												color: colors.primary,
+												fontFamily: typography.primary.semiBold,
+												fontSize: 12,
+											},
+										]}
+									></Text>
+									<WorkedOnTaskHours
+										memberTask={profile.activeUserTeamTask}
+										containerStyle={{ alignItems: "center" }}
+										totalTimeText={{ color: colors.primary, fontSize: 12 }}
+									/>
+								</View>
+							</View>
 							<ListCardItem
-								task={task}
-								isAssigned={true}
+								task={profile.activeUserTeamTask}
 								isAuthUser={profile.isAuthUser}
-								activeAuthTask={activeTaskId === task?.id}
-								profile={profile}
-							/>
-						</View>
-					))}
-				</View>
-			)}
-
-			{content.tab === "assigned" && (
-				<View style={{ ...GS.mt4 }}>
-					{content.tasksFiltered.map((task, index) => (
-						<View key={index.toString()} style={{ ...GS.mb4 }}>
-							<ListCardItem
-								task={task}
 								isAssigned={true}
-								isAuthUser={profile.isAuthUser}
-								activeAuthTask={false}
+								activeAuthTask={true}
 								profile={profile}
 							/>
+						</>
+					) : null}
+
+					{content.tab === "worked" && (
+						<View>
+							<View
+								style={{
+									flexDirection: "row",
+									justifyContent: "space-between",
+									marginVertical: 20,
+								}}
+							>
+								<Text style={[$textLabel, { color: colors.primary }]}>
+									{translate("tasksScreen.last24hours")} ({tasks.length})
+								</Text>
+								<View
+									style={{
+										width: width / 1.5,
+										alignSelf: "center",
+										top: 3,
+										borderBottomWidth: 1,
+										borderBottomColor: colors.border,
+									}}
+								/>
+							</View>
+							{tasks.map((task, index) => (
+								<View key={index.toString()} style={{ ...GS.mb4 }}>
+									<ListCardItem
+										task={task}
+										isAssigned={true}
+										isAuthUser={profile.isAuthUser}
+										activeAuthTask={activeTaskId === task?.id}
+										profile={profile}
+									/>
+								</View>
+							))}
 						</View>
-					))}
-				</View>
+					)}
+				</ScrollView>
 			)}
 
-			{content.tab === "unassigned" && (
-				<View style={{ ...GS.mt4 }}>
-					{content.tasksFiltered.map((task, index) => (
-						<View key={index.toString()} style={{ ...GS.mb4 }}>
-							<ListCardItem
-								task={task}
-								isAssigned={false}
-								isAuthUser={profile.isAuthUser}
-								activeAuthTask={false}
-								profile={profile}
-							/>
-						</View>
-					))}
+			{(content.tab === "assigned" || content.tab === "unassigned") && (
+				<View
+					style={{
+						flex: 1,
+						paddingHorizontal: 10,
+						backgroundColor: dark ? "rgb(16,17,20)" : colors.background2,
+					}}
+				>
+					{content.tab === "assigned" && (
+						<FlatList
+							showsVerticalScrollIndicator={false}
+							bounces={false}
+							data={content.tasksFiltered}
+							renderItem={({ item, index }) => (
+								<View
+									key={index.toString()}
+									style={{ ...GS.mb4, marginHorizontal: 10, marginTop: index === 0 && 20 }}
+								>
+									<ListCardItem
+										task={item}
+										isAssigned={true}
+										isAuthUser={profile.isAuthUser}
+										activeAuthTask={false}
+										profile={profile}
+									/>
+								</View>
+							)}
+						/>
+					)}
+
+					{content.tab === "unassigned" && (
+						<FlatList
+							showsVerticalScrollIndicator={false}
+							bounces={false}
+							data={content.tasksFiltered}
+							initialNumToRender={5}
+							renderItem={({ item, index }) => (
+								<View
+									key={index.toString()}
+									style={{ ...GS.mb4, marginHorizontal: 10, marginTop: index === 0 && 20 }}
+								>
+									<ListCardItem
+										task={item}
+										isAssigned={true}
+										isAuthUser={profile.isAuthUser}
+										activeAuthTask={false}
+										profile={profile}
+									/>
+								</View>
+							)}
+						/>
+					)}
 				</View>
 			)}
-		</ScrollView>
+		</>
 	)
 })
 
diff --git a/apps/mobile/app/screens/Authenticated/TaskLabelScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskLabelScreen/index.tsx
index 8f5d88838..ba5baaecc 100644
--- a/apps/mobile/app/screens/Authenticated/TaskLabelScreen/index.tsx
+++ b/apps/mobile/app/screens/Authenticated/TaskLabelScreen/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from "react"
-import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, ScrollView } from "react-native"
+import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList } from "react-native"
 import { AntDesign, Ionicons } from "@expo/vector-icons"
 import { Screen } from "../../../components"
 import { AuthenticatedDrawerScreenProps } from "../../../navigators/AuthenticatedNavigator"
@@ -36,8 +36,6 @@ export const TaskLabelScreen: FC<AuthenticatedDrawerScreenProps<"TaskLabelScreen
 
 		return (
 			<Screen
-				preset="scroll"
-				ScrollViewProps={{ bounces: false }}
 				contentContainerStyle={[$container, { backgroundColor: colors.background2 }]}
 				safeAreaEdges={["top"]}
 			>
@@ -52,7 +50,7 @@ export const TaskLabelScreen: FC<AuthenticatedDrawerScreenProps<"TaskLabelScreen
 							</Text>
 						</View>
 					</View>
-					<ScrollView style={{ width: "100%", padding: 20, maxHeight: "80%" }} bounces={false}>
+					<View style={{ width: "100%", padding: 20, maxHeight: "80%" }}>
 						<View>
 							<Text style={styles.title2}>{translate("settingScreen.labelScreen.listLabels")}</Text>
 						</View>
@@ -63,23 +61,24 @@ export const TaskLabelScreen: FC<AuthenticatedDrawerScreenProps<"TaskLabelScreen
 									{translate("settingScreen.labelScreen.noActiveLabels")}
 								</Text>
 							) : null}
-							{labels?.items?.map((item, index) => (
-								<View
-									key={index}
-									style={{
-										marginBottom: labels?.items.length === index + 1 ? 40 : 0,
-										width: "100%",
-									}}
-								>
+
+							<FlatList
+								bounces={false}
+								showsVerticalScrollIndicator={false}
+								style={{ width: "100%" }}
+								data={labels?.items}
+								renderItem={({ item }) => (
 									<LabelItem
 										openForEdit={() => openForEdit(item)}
 										onDeleteLabel={() => deleteLabel(item.id)}
 										label={item}
 									/>
-								</View>
-							))}
+								)}
+								keyExtractor={(_, index) => index.toString()}
+								ListFooterComponent={() => <View style={{ marginBottom: 40 }} />}
+							/>
 						</View>
-					</ScrollView>
+					</View>
 					<TouchableOpacity
 						style={{ ...styles.createButton, borderColor: dark ? "#6755C9" : "#3826A6" }}
 						onPress={() => {
diff --git a/apps/mobile/app/screens/Authenticated/TaskPrioritiesScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskPrioritiesScreen/index.tsx
index 919ef28c2..fdf1e3b86 100644
--- a/apps/mobile/app/screens/Authenticated/TaskPrioritiesScreen/index.tsx
+++ b/apps/mobile/app/screens/Authenticated/TaskPrioritiesScreen/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from "react"
-import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, ScrollView } from "react-native"
+import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList } from "react-native"
 import { AntDesign, Ionicons } from "@expo/vector-icons"
 import { Screen } from "../../../components"
 import { AuthenticatedDrawerScreenProps } from "../../../navigators/AuthenticatedNavigator"
@@ -37,8 +37,6 @@ export const TaskPriorityScreen: FC<AuthenticatedDrawerScreenProps<"TaskPriority
 
 		return (
 			<Screen
-				preset="scroll"
-				ScrollViewProps={{ bounces: false }}
 				contentContainerStyle={[$container, { backgroundColor: colors.background2 }]}
 				safeAreaEdges={["top"]}
 			>
@@ -53,7 +51,7 @@ export const TaskPriorityScreen: FC<AuthenticatedDrawerScreenProps<"TaskPriority
 							</Text>
 						</View>
 					</View>
-					<ScrollView style={{ width: "100%", padding: 20, maxHeight: "80%" }} bounces={false}>
+					<View style={{ width: "100%", padding: 20, maxHeight: "80%" }}>
 						<View>
 							<Text style={styles.title2}>
 								{translate("settingScreen.priorityScreen.listPriorities")}
@@ -66,23 +64,24 @@ export const TaskPriorityScreen: FC<AuthenticatedDrawerScreenProps<"TaskPriority
 									{translate("settingScreen.priorityScreen.noActivePriorities")}
 								</Text>
 							) : null}
-							{priorities?.items?.map((item, index) => (
-								<View
-									key={index}
-									style={{
-										marginBottom: priorities?.items.length === index + 1 ? 40 : 0,
-										width: "100%",
-									}}
-								>
+
+							<FlatList
+								bounces={false}
+								showsVerticalScrollIndicator={false}
+								style={{ width: "100%" }}
+								data={priorities?.items}
+								renderItem={({ item }) => (
 									<PriorityItem
 										openForEdit={() => openForEdit(item)}
 										onDeletePriority={() => deletePriority(item.id)}
 										priority={item}
 									/>
-								</View>
-							))}
+								)}
+								keyExtractor={(_, index) => index.toString()}
+								ListFooterComponent={() => <View style={{ marginBottom: 40 }} />}
+							/>
 						</View>
-					</ScrollView>
+					</View>
 					<TouchableOpacity
 						style={{ ...styles.createButton, borderColor: dark ? "#6755C9" : "#3826A6" }}
 						onPress={() => {
diff --git a/apps/mobile/app/screens/Authenticated/TaskSizeScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskSizeScreen/index.tsx
index 57916a0e8..8bc410477 100644
--- a/apps/mobile/app/screens/Authenticated/TaskSizeScreen/index.tsx
+++ b/apps/mobile/app/screens/Authenticated/TaskSizeScreen/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from "react"
-import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, ScrollView } from "react-native"
+import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList } from "react-native"
 import { AntDesign, Ionicons } from "@expo/vector-icons"
 import { Screen } from "../../../components"
 import { AuthenticatedDrawerScreenProps } from "../../../navigators/AuthenticatedNavigator"
@@ -36,8 +36,6 @@ export const TaskSizeScreen: FC<AuthenticatedDrawerScreenProps<"TaskSizeScreen">
 
 		return (
 			<Screen
-				preset="scroll"
-				ScrollViewProps={{ bounces: false }}
 				contentContainerStyle={[$container, { backgroundColor: colors.background2 }]}
 				safeAreaEdges={["top"]}
 			>
@@ -52,7 +50,7 @@ export const TaskSizeScreen: FC<AuthenticatedDrawerScreenProps<"TaskSizeScreen">
 							</Text>
 						</View>
 					</View>
-					<ScrollView style={{ width: "100%", padding: 20, maxHeight: "80%" }} bounces={false}>
+					<View style={{ width: "100%", padding: 20, maxHeight: "80%" }}>
 						<View>
 							<Text style={styles.title2}>{translate("settingScreen.sizeScreen.listSizes")}</Text>
 						</View>
@@ -63,23 +61,24 @@ export const TaskSizeScreen: FC<AuthenticatedDrawerScreenProps<"TaskSizeScreen">
 									{translate("settingScreen.sizeScreen.noActiveSizes")}
 								</Text>
 							) : null}
-							{sizes?.items?.map((item, index) => (
-								<View
-									key={index}
-									style={{
-										marginBottom: sizes?.items.length === index + 1 ? 40 : 0,
-										width: "100%",
-									}}
-								>
+
+							<FlatList
+								bounces={false}
+								showsVerticalScrollIndicator={false}
+								style={{ width: "100%" }}
+								data={sizes?.items}
+								renderItem={({ item }) => (
 									<SizeItem
 										openForEdit={() => openForEdit(item)}
 										onDeleteSize={() => deleteSize(item.id)}
 										size={item}
 									/>
-								</View>
-							))}
+								)}
+								keyExtractor={(_, index) => index.toString()}
+								ListFooterComponent={() => <View style={{ marginBottom: 40 }} />}
+							/>
 						</View>
-					</ScrollView>
+					</View>
 					<TouchableOpacity
 						style={{ ...styles.createButton, borderColor: dark ? "#6755C9" : "#3826A6" }}
 						onPress={() => {
diff --git a/apps/mobile/app/screens/Authenticated/TaskStatusScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TaskStatusScreen/index.tsx
index a8a7b931c..294fee0a9 100644
--- a/apps/mobile/app/screens/Authenticated/TaskStatusScreen/index.tsx
+++ b/apps/mobile/app/screens/Authenticated/TaskStatusScreen/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
 import React, { FC, useState } from "react"
-import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, ScrollView } from "react-native"
+import { View, Text, ViewStyle, TouchableOpacity, StyleSheet, FlatList } from "react-native"
 import { AntDesign, Ionicons } from "@expo/vector-icons"
 import { Screen } from "../../../components"
 import { AuthenticatedDrawerScreenProps } from "../../../navigators/AuthenticatedNavigator"
@@ -35,8 +35,6 @@ export const TaskStatusScreen: FC<AuthenticatedDrawerScreenProps<"TaskStatus">>
 		// console.log("in-progress-again".replaceAll("-", " "))
 		return (
 			<Screen
-				preset="scroll"
-				ScrollViewProps={{ bounces: false }}
 				contentContainerStyle={[$container, { backgroundColor: colors.background2 }]}
 				safeAreaEdges={["top"]}
 			>
@@ -51,7 +49,7 @@ export const TaskStatusScreen: FC<AuthenticatedDrawerScreenProps<"TaskStatus">>
 							</Text>
 						</View>
 					</View>
-					<ScrollView style={{ width: "100%", padding: 20, maxHeight: "80%" }} bounces={false}>
+					<View style={{ width: "100%", padding: 20, maxHeight: "80%" }}>
 						<View>
 							<Text style={styles.title2}>
 								{translate("settingScreen.statusScreen.listStatuses")}
@@ -64,23 +62,24 @@ export const TaskStatusScreen: FC<AuthenticatedDrawerScreenProps<"TaskStatus">>
 									{translate("settingScreen.statusScreen.noActiveStatuses")}
 								</Text>
 							) : null}
-							{statuses?.items?.map((item, index) => (
-								<View
-									key={index}
-									style={{
-										marginBottom: statuses?.items.length === index + 1 ? 40 : 0,
-										width: "100%",
-									}}
-								>
+
+							<FlatList
+								bounces={false}
+								showsVerticalScrollIndicator={false}
+								style={{ width: "100%" }}
+								data={statuses?.items}
+								renderItem={({ item }) => (
 									<StatusItem
 										openForEdit={() => openForEdit(item)}
 										onDeleteTask={() => deleteStatus(item.id)}
 										status={item}
 									/>
-								</View>
-							))}
+								)}
+								keyExtractor={(_, index) => index.toString()}
+								ListFooterComponent={() => <View style={{ marginBottom: 40 }} />}
+							/>
 						</View>
-					</ScrollView>
+					</View>
 					<TouchableOpacity
 						style={{ ...styles.createButton, borderColor: dark ? "#6755C9" : "#3826A6" }}
 						onPress={() => {
diff --git a/apps/mobile/app/screens/Authenticated/TeamScreen/components/UnassignedTaskList.tsx b/apps/mobile/app/screens/Authenticated/TeamScreen/components/UnassignedTaskList.tsx
index aef5e69cb..aa1de23c3 100644
--- a/apps/mobile/app/screens/Authenticated/TeamScreen/components/UnassignedTaskList.tsx
+++ b/apps/mobile/app/screens/Authenticated/TeamScreen/components/UnassignedTaskList.tsx
@@ -1,8 +1,8 @@
 /* eslint-disable camelcase */
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
-import React from "react"
-import { StyleSheet, Text, Image, ImageStyle, TouchableOpacity } from "react-native"
+import React, { FC } from "react"
+import { StyleSheet, Text, Image, ImageStyle, TouchableOpacity, FlatList } from "react-native"
 import { spacing, typography, useAppTheme } from "../../../../theme"
 import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
 import { observer } from "mobx-react-lite"
@@ -42,99 +42,110 @@ const UnassignedTasksList = observer(
 					</View>
 				</View>
 				<ScrollView style={{ height: 150 }}>
-					{memberInfo.memberUnassignTasks.map((task: ITeamTask, index: number) => {
-						if (task?.status !== "closed") {
-							return (
-								<TouchableOpacity
-									onPress={() => {
-										memberInfo?.assignTask(task)
-										setShowUnassignedList(false)
-									}}
-									key={index}
-									style={[
-										styles.unassignedTaskContainer,
-										index === memberInfo?.memberUnassignTasks.length - 1 && { marginBottom: 10 },
-									]}
-								>
-									<View
-										style={{
-											flexDirection: "row",
-											justifyContent: "space-between",
-											alignItems: "center",
-											width: "60%",
-										}}
-									>
-										<View style={styles.wrapTaskNumber}>
-											<IssuesModal task={task} readonly={true} />
-											<Text
-												style={{ color: "#9490A0", fontSize: 12, marginLeft: 5 }}
-											>{`#${task.taskNumber}`}</Text>
-										</View>
+					<FlatList
+						bounces={false}
+						showsVerticalScrollIndicator={false}
+						data={memberInfo.memberUnassignTasks}
+						style={{ flexGrow: 1 }}
+						contentContainerStyle={{ height: 150 }}
+						renderItem={({ item, index }) =>
+							item?.status !== "closed" ? (
+								<UnassignedTask
+									task={item}
+									index={index}
+									colors={colors.primary}
+									memberInfo={memberInfo}
+									setShowUnassignedList={setShowUnassignedList}
+								/>
+							) : null
+						}
+						keyExtractor={(_, index) => index.toString()}
+					/>
+				</ScrollView>
+			</View>
+		)
+	},
+)
+export default UnassignedTasksList
 
-										<Text
-											style={[styles.unasignedTaskTitle, { color: colors.primary }]}
-											numberOfLines={2}
-										>
-											{task.title}
-										</Text>
-									</View>
-									<View
-										style={{
-											flexDirection: "row",
-											width: "40%",
-											alignItems: "center",
-											zIndex: 1000,
-											justifyContent: "space-between",
-										}}
-									>
-										<View>
-											<TaskStatus
-												iconsOnly={true}
-												task={task}
-												containerStyle={styles.statusContainer}
-											/>
-										</View>
-										<View
-											style={{
-												flexDirection: "row",
-												alignItems: "center",
-												justifyContent: "space-between",
-												width: "35%",
-											}}
-										>
-											<View style={{ flexDirection: "row" }}>
-												{task.members[0]?.user?.imageUrl ? (
-													<Image
-														source={{ uri: task.members[0]?.user?.imageUrl }}
-														style={$usersProfile}
-													/>
-												) : null}
-												{task.members[1]?.user?.imageUrl ? (
-													<Image
-														source={{ uri: task.members[1]?.user?.imageUrl }}
-														style={$usersProfile2}
-													/>
-												) : null}
-											</View>
-											{/* {task.status === "closed" ? (
+const UnassignedTask: FC<{
+	task: ITeamTask
+	memberInfo: I_TeamMemberCardHook
+	setShowUnassignedList: React.Dispatch<React.SetStateAction<boolean>>
+	index: number
+	colors: string
+}> = ({ task, memberInfo, index, setShowUnassignedList, colors }) => {
+	return (
+		<TouchableOpacity
+			onPress={() => {
+				memberInfo?.assignTask(task)
+				setShowUnassignedList(false)
+			}}
+			key={index}
+			style={[
+				styles.unassignedTaskContainer,
+				index === memberInfo?.memberUnassignTasks.length - 1 && { marginBottom: 10 },
+			]}
+		>
+			<View
+				style={{
+					flexDirection: "row",
+					justifyContent: "space-between",
+					alignItems: "center",
+					width: "60%",
+				}}
+			>
+				<View style={styles.wrapTaskNumber}>
+					<IssuesModal task={task} readonly={true} />
+					<Text
+						style={{ color: "#9490A0", fontSize: 12, marginLeft: 5 }}
+					>{`#${task.taskNumber}`}</Text>
+				</View>
+
+				<Text style={[styles.unasignedTaskTitle, { color: colors }]} numberOfLines={2}>
+					{task.title}
+				</Text>
+			</View>
+			<View
+				style={{
+					flexDirection: "row",
+					width: "40%",
+					alignItems: "center",
+					zIndex: 1000,
+					justifyContent: "space-between",
+				}}
+			>
+				<View>
+					<TaskStatus iconsOnly={true} task={task} containerStyle={styles.statusContainer} />
+				</View>
+				<View
+					style={{
+						flexDirection: "row",
+						alignItems: "center",
+						justifyContent: "space-between",
+						width: "35%",
+					}}
+				>
+					<View style={{ flexDirection: "row" }}>
+						{task.members[0]?.user?.imageUrl ? (
+							<Image source={{ uri: task.members[0]?.user?.imageUrl }} style={$usersProfile} />
+						) : null}
+						{task.members[1]?.user?.imageUrl ? (
+							<Image source={{ uri: task.members[1]?.user?.imageUrl }} style={$usersProfile2} />
+						) : null}
+					</View>
+					{/* {task.status === "closed" ? (
 											<EvilIcons name="refresh" size={24} color="#8F97A1" />
 										) : (
 											<View>
 												<Entypo name="cross" size={15} color="#8F97A1" />
 											</View>
 										)} */}
-										</View>
-									</View>
-								</TouchableOpacity>
-							)
-						} else return null
-					})}
-				</ScrollView>
+				</View>
 			</View>
-		)
-	},
-)
-export default UnassignedTasksList
+		</TouchableOpacity>
+	)
+}
 
 const $usersProfile: ImageStyle = {
 	...GS.roundedFull,
@@ -188,15 +199,6 @@ const styles = StyleSheet.create({
 		width: "100%",
 		zIndex: 1000,
 	},
-	wrapBugIcon: {
-		alignItems: "center",
-		backgroundColor: "#C24A4A",
-		borderRadius: 3,
-		height: 20,
-		justifyContent: "center",
-		marginRight: 3,
-		width: 20,
-	},
 	wrapTaskNumber: {
 		flexDirection: "row",
 	},
diff --git a/apps/mobile/app/screens/Authenticated/TeamScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TeamScreen/index.tsx
index e755035e7..cce1c186b 100644
--- a/apps/mobile/app/screens/Authenticated/TeamScreen/index.tsx
+++ b/apps/mobile/app/screens/Authenticated/TeamScreen/index.tsx
@@ -1,8 +1,8 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-inline-styles */
-import React, { FC, useState } from "react"
+/* eslint-disable camelcase */
+import React, { FC, SetStateAction, useState } from "react"
 import {
-	ScrollView,
 	View,
 	TouchableOpacity,
 	ViewStyle,
@@ -10,6 +10,7 @@ import {
 	Text,
 	Dimensions,
 	LogBox,
+	FlatList,
 } from "react-native"
 
 // TYPES
@@ -38,6 +39,8 @@ import { useAcceptInviteModal } from "../../../services/hooks/features/useAccept
 import NoTeam from "../../../components/NoTeam"
 import VerifyAccountModal from "./components/VerifyAccount"
 import { useVerifyEmail } from "../../../services/hooks/features/useVerifyEmail"
+import { OT_Member } from "../../../services/interfaces/IOrganizationTeam"
+import { IInvitation } from "../../../services/interfaces/IInvite"
 
 const { width, height } = Dimensions.get("window")
 export const AuthenticatedTeamScreen: FC<AuthenticatedTabScreenProps<"Team">> =
@@ -157,48 +160,45 @@ export const AuthenticatedTeamScreen: FC<AuthenticatedTabScreenProps<"Team">> =
 									</View>
 
 									{/* Users activity list */}
-									<ScrollView
-										bounces={false}
-										showsVerticalScrollIndicator={false}
-										contentContainerStyle={{ ...GS.px1 }}
+									<View
 										style={[$cardContainer, { backgroundColor: dark ? "rgb(0,0,0)" : "#F7F7F8" }]}
 									>
-										<View
-											style={{
-												marginBottom: 30,
+										<FlatList
+											data={[currentUser, $otherMembers, teamInvitations]}
+											showsVerticalScrollIndicator={false}
+											bounces={false}
+											keyExtractor={(item, index) => index.toString()}
+											renderItem={({ item, index }) => {
+												if (index === 0) {
+													return (
+														<CurrentUserCard
+															member={item as OT_Member}
+															openMenuIndex={openMenuIndex}
+															setOpenMenuIndex={setOpenMenuIndex}
+														/>
+													)
+												} else if (index === 1) {
+													return (
+														<OtherMembersList
+															members={item as OT_Member[]}
+															openMenuIndex={openMenuIndex}
+															setOpenMenuIndex={setOpenMenuIndex}
+														/>
+													)
+												} else {
+													return (
+														<InvitationsList
+															invitations={item as IInvitation[]}
+															$otherMembers={$otherMembers}
+															openMenuIndex={openMenuIndex}
+															setOpenMenuIndex={setOpenMenuIndex}
+														/>
+													)
+												}
 											}}
-										>
-											{currentUser && (
-												<ListCardItem
-													member={currentUser}
-													index={0}
-													openMenuIndex={openMenuIndex}
-													setOpenMenuIndex={setOpenMenuIndex}
-												/>
-											)}
-
-											{$otherMembers.map((member, index) => (
-												<ListCardItem
-													key={index}
-													member={member}
-													index={index + 1}
-													openMenuIndex={openMenuIndex}
-													setOpenMenuIndex={setOpenMenuIndex}
-												/>
-											))}
-
-											{teamInvitations &&
-												teamInvitations.map((invite, idx) => (
-													<InviteCardItem
-														key={idx}
-														invite={invite}
-														index={idx + $otherMembers.length + 1}
-														openMenuIndex={openMenuIndex}
-														setOpenMenuIndex={setOpenMenuIndex}
-													/>
-												))}
-										</View>
-									</ScrollView>
+											ListFooterComponent={<View style={{ marginBottom: 30 }} />}
+										/>
+									</View>
 								</>
 							) : (
 								<NoTeam onPress={() => setShowCreateTeamModal(true)} />
@@ -210,13 +210,79 @@ export const AuthenticatedTeamScreen: FC<AuthenticatedTabScreenProps<"Team">> =
 		)
 	}
 
+const CurrentUserCard: FC<{
+	member: OT_Member
+	openMenuIndex: number | null
+	setOpenMenuIndex: React.Dispatch<SetStateAction<number | null>>
+}> = ({ member, openMenuIndex, setOpenMenuIndex }) => {
+	return (
+		<View style={{ marginHorizontal: 9 }}>
+			<ListCardItem
+				member={member}
+				index={0}
+				openMenuIndex={openMenuIndex}
+				setOpenMenuIndex={setOpenMenuIndex}
+			/>
+		</View>
+	)
+}
+
+const OtherMembersList: FC<{
+	members: OT_Member[]
+	openMenuIndex: number | null
+	setOpenMenuIndex: React.Dispatch<SetStateAction<number | null>>
+}> = ({ members, openMenuIndex, setOpenMenuIndex }) => {
+	return (
+		<View style={{ marginHorizontal: 9 }}>
+			<FlatList
+				data={members}
+				keyExtractor={(_, index) => index.toString()}
+				renderItem={({ item, index }) => (
+					<ListCardItem
+						key={index}
+						member={item}
+						index={index + 1}
+						openMenuIndex={openMenuIndex}
+						setOpenMenuIndex={setOpenMenuIndex}
+					/>
+				)}
+			/>
+		</View>
+	)
+}
+
+const InvitationsList: FC<{
+	invitations: IInvitation[]
+	$otherMembers: OT_Member[]
+	openMenuIndex: number | null
+	setOpenMenuIndex: React.Dispatch<SetStateAction<number | null>>
+}> = ({ invitations, $otherMembers, openMenuIndex, setOpenMenuIndex }) => {
+	return (
+		<View style={{ marginHorizontal: 9 }}>
+			<FlatList
+				data={invitations}
+				keyExtractor={(_, index) => ($otherMembers.length + index).toString()}
+				renderItem={({ item, index }) => (
+					<InviteCardItem
+						key={index}
+						invite={item}
+						index={index + $otherMembers.length + 1}
+						openMenuIndex={openMenuIndex}
+						setOpenMenuIndex={setOpenMenuIndex}
+					/>
+				)}
+			/>
+		</View>
+	)
+}
+
 const $container: ViewStyle = {
 	...GS.flex1,
 }
 
 const $cardContainer: ViewStyle = {
 	...GS.flex1,
-	paddingHorizontal: spacing.medium,
+	paddingHorizontal: spacing.small,
 }
 const $blurContainer: ViewStyle = {
 	height,
diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx
index 6a10a38a4..ae5534993 100644
--- a/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx
+++ b/apps/mobile/app/screens/Authenticated/TimerScreen/components/ComboBox.tsx
@@ -1,10 +1,9 @@
 /* eslint-disable camelcase */
 /* eslint-disable react-native/no-inline-styles */
 /* eslint-disable react-native/no-color-literals */
-import React, { FC } from "react"
+import React, { FC, useState } from "react"
 import { Text } from "react-native-paper"
-import { View, StyleSheet, Dimensions, TouchableWithoutFeedback, Pressable } from "react-native"
-import { ScrollView } from "react-native-gesture-handler"
+import { View, StyleSheet, TouchableWithoutFeedback, Pressable, FlatList } from "react-native"
 import { Ionicons } from "@expo/vector-icons"
 import TaskDisplayBox from "./TaskDisplayBox"
 import { observer } from "mobx-react-lite"
@@ -18,10 +17,10 @@ export interface Props {
 	closeCombo: () => unknown
 	setEditMode: (val: boolean) => void
 }
-const { height } = Dimensions.get("window")
 
 const ComboBox: FC<Props> = observer(function ComboBox({ tasksHandler, closeCombo, setEditMode }) {
 	const { colors } = useAppTheme()
+	const [isScrolling, setIsScrolling] = useState<boolean>(false)
 
 	return (
 		<TouchableWithoutFeedback>
@@ -54,18 +53,25 @@ const ComboBox: FC<Props> = observer(function ComboBox({ tasksHandler, closeComb
 						/>
 					</Pressable>
 				</View>
-				<ScrollView style={{ maxHeight: 315, paddingBottom: 9 }}>
-					{tasksHandler.filteredTasks.map((task, i) => (
-						<IndividualTask
-							key={i}
-							onReopenTask={() => tasksHandler.handleReopenTask(task)}
-							task={task}
-							handleActiveTask={tasksHandler.setActiveTeamTask}
-							closeCombo={closeCombo}
-							setEditMode={setEditMode}
-						/>
-					))}
-				</ScrollView>
+				<View style={{ maxHeight: 315 }}>
+					<FlatList
+						onScrollBeginDrag={() => setIsScrolling(true)}
+						onScrollEndDrag={() => setIsScrolling(false)}
+						showsVerticalScrollIndicator={false}
+						data={tasksHandler.filteredTasks}
+						renderItem={({ item, index }) => (
+							<IndividualTask
+								key={index}
+								onReopenTask={() => tasksHandler.handleReopenTask(item)}
+								task={item}
+								isScrolling={isScrolling}
+								handleActiveTask={tasksHandler.setActiveTeamTask}
+								closeCombo={closeCombo}
+								setEditMode={setEditMode}
+							/>
+						)}
+					/>
+				</View>
 			</View>
 		</TouchableWithoutFeedback>
 	)
@@ -96,21 +102,12 @@ const styles = StyleSheet.create({
 		paddingBottom: 16,
 		width: 232,
 	},
-	loading: {
-		position: "absolute",
-		right: 10,
-		top: 15,
-	},
+
 	mainContainer: {
 		marginTop: 16,
 		width: "100%",
 		zIndex: 5,
 	},
-	wrapList: {
-		marginBottom: 20,
-		maxHeight: height / 3,
-		zIndex: 100,
-	},
 })
 
 export default ComboBox
diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx
index a2c8c3bd0..803befa05 100644
--- a/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx
+++ b/apps/mobile/app/screens/Authenticated/TimerScreen/components/IndividualTask.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable react-native/no-inline-styles */
 /* eslint-disable react-native/no-color-literals */
 import React, { FC, useMemo, useState } from "react"
-import { View, StyleSheet, Text, Image, ImageStyle, TouchableOpacity } from "react-native"
+import { View, StyleSheet, Text, ImageStyle, TouchableOpacity } from "react-native"
 import { Entypo, EvilIcons } from "@expo/vector-icons"
 import { GLOBAL_STYLE as GS } from "../../../../../assets/ts/styles"
 import { colors, spacing, typography, useAppTheme } from "../../../../theme"
@@ -12,6 +12,8 @@ import TaskStatus from "../../../../components/TaskStatus"
 import { useTeamTasks } from "../../../../services/hooks/features/useTeamTasks"
 import IssuesModal from "../../../../components/IssuesModal"
 import { limitTextCharaters } from "../../../../helpers/sub-text"
+import { Avatar } from "react-native-paper"
+import { imgTitleProfileAvatar } from "../../../../helpers/img-title-profile-avatar"
 
 export interface Props {
 	task: ITeamTask
@@ -19,10 +21,11 @@ export interface Props {
 	closeCombo?: () => unknown
 	onReopenTask: () => unknown
 	setEditMode: (val: boolean) => void
+	isScrolling: boolean
 }
 
 const IndividualTask: FC<Props> = observer(
-	({ task, handleActiveTask, closeCombo, onReopenTask, setEditMode }) => {
+	({ task, handleActiveTask, closeCombo, onReopenTask, setEditMode, isScrolling }) => {
 		const { colors } = useAppTheme()
 		const [showDel, setShowDel] = useState(false)
 		const { updateTask } = useTeamTasks()
@@ -52,7 +55,7 @@ const IndividualTask: FC<Props> = observer(
 			>
 				<View
 					onTouchEnd={() => {
-						handleActiveTask(task)
+						!isScrolling && handleActiveTask(task)
 					}} // added it here because doesn't work when assigned to the parent
 					style={{
 						flexDirection: "row",
@@ -74,7 +77,7 @@ const IndividualTask: FC<Props> = observer(
 				</View>
 				<View
 					onTouchEnd={() => {
-						handleActiveTask(task)
+						!isScrolling && handleActiveTask(task)
 					}} // added it here because doesn't work when assigned to the parent
 					style={{
 						flexDirection: "row",
@@ -96,11 +99,29 @@ const IndividualTask: FC<Props> = observer(
 						}}
 					>
 						<View style={{ flexDirection: "row" }}>
-							{assigneeImg1 ? <Image source={{ uri: assigneeImg1 }} style={$usersProfile} /> : null}
+							{assigneeImg1 ? (
+								<Avatar.Image source={{ uri: assigneeImg1 }} size={24} style={$usersProfile} />
+							) : task.members[0] ? (
+								<Avatar.Text
+									label={imgTitleProfileAvatar(task.members[0]?.user?.name)}
+									size={24}
+									style={[$usersProfile, { backgroundColor: "#82c9e0" }]}
+									labelStyle={styles.prefix}
+								/>
+							) : null}
+
 							{assigneeImg2 ? (
-								<Image source={{ uri: assigneeImg2 }} style={$usersProfile2} />
+								<Avatar.Image source={{ uri: assigneeImg2 }} size={24} style={$usersProfile2} />
+							) : task.members[1] ? (
+								<Avatar.Text
+									label={imgTitleProfileAvatar(task.members[1]?.user?.name)}
+									size={24}
+									style={[$usersProfile2, { backgroundColor: "#82c9e0" }]}
+									labelStyle={styles.prefix}
+								/>
 							) : null}
 						</View>
+
 						{task.status === "closed" ? (
 							<EvilIcons name="refresh" size={24} color="#8F97A1" onPress={() => onReopenTask()} />
 						) : (
@@ -133,6 +154,11 @@ const styles = StyleSheet.create({
 		width: "100%",
 		zIndex: 1000,
 	},
+	prefix: {
+		color: "#FFFFFF",
+		fontFamily: typography.fonts.PlusJakartaSans.light,
+		fontSize: 20,
+	},
 	statusContainer: {
 		alignItems: "center",
 		backgroundColor: "#ECE8FC",
diff --git a/apps/mobile/app/screens/Authenticated/TimerScreen/index.tsx b/apps/mobile/app/screens/Authenticated/TimerScreen/index.tsx
index 42e05ae29..94610fbcc 100644
--- a/apps/mobile/app/screens/Authenticated/TimerScreen/index.tsx
+++ b/apps/mobile/app/screens/Authenticated/TimerScreen/index.tsx
@@ -45,8 +45,6 @@ export const AuthenticatedTimerScreen: FC<AuthenticatedTabScreenProps<"Timer">>
 
 		return (
 			<Screen
-				preset="scroll"
-				ScrollViewProps={{ bounces: false }}
 				contentContainerStyle={[$container, { backgroundColor: colors.background2 }]}
 				backgroundColor={dark ? "rgb(16,17,20)" : colors.background}
 				safeAreaEdges={["top"]}
diff --git a/apps/mobile/app/screens/LoginScreen/Components/PassCode.tsx b/apps/mobile/app/screens/LoginScreen/Components/PassCode.tsx
index 622408cb0..ed73d9b85 100644
--- a/apps/mobile/app/screens/LoginScreen/Components/PassCode.tsx
+++ b/apps/mobile/app/screens/LoginScreen/Components/PassCode.tsx
@@ -2,7 +2,15 @@
 import React, { FC, useEffect, useRef, useState } from "react"
 import * as Animatable from "react-native-animatable"
 import EStyleSheet from "react-native-extended-stylesheet"
-import { View, Text, Dimensions, TextInput, ViewStyle, TouchableOpacity } from "react-native"
+import {
+	View,
+	Text,
+	Dimensions,
+	TextInput,
+	ViewStyle,
+	TouchableOpacity,
+	FlatList,
+} from "react-native"
 import { observer } from "mobx-react-lite"
 import { Feather } from "@expo/vector-icons"
 import { ActivityIndicator } from "react-native-paper"
@@ -15,7 +23,6 @@ import { CodeInput } from "../../../components/CodeInput"
 import { GLOBAL_STYLE as GS } from "../../../../assets/ts/styles"
 import { EMAIL_REGEX } from "../../../helpers/regex"
 import UserTenants from "./UserTenants"
-import { ScrollView } from "react-native-gesture-handler"
 import { IWorkspace, VerificationResponse } from "../../../services/interfaces/IAuthentication"
 
 interface Props {
@@ -228,12 +235,15 @@ const PassCode: FC<Props> = observer(
 						<Text style={{ ...styles.text, alignSelf: "center" }}>
 							{translate("loginScreen.selectWorkspaceFieldLabel")}
 						</Text>
-						<ScrollView>
-							{workspaceData?.map((workspace: IWorkspace, i: number) => (
+
+						<FlatList
+							data={workspaceData}
+							showsVerticalScrollIndicator={false}
+							renderItem={({ item, index }: { item: IWorkspace; index: number }) => (
 								<UserTenants
-									key={i}
-									index={i}
-									data={workspace}
+									key={index}
+									index={index}
+									data={item}
 									activeTeamId={activeTeamId}
 									setActiveTeamId={setActiveTeamId}
 									selectedWorkspace={selectedWorkspace}
@@ -242,8 +252,8 @@ const PassCode: FC<Props> = observer(
 									setIsValid={setIsValid}
 									setTempAuthToken={setTempAuthToken}
 								/>
-							))}
-						</ScrollView>
+							)}
+						/>
 					</View>
 				)}
 				<View style={styles.buttonsView}>
diff --git a/apps/mobile/app/screens/LoginScreen/Components/UserTenants.tsx b/apps/mobile/app/screens/LoginScreen/Components/UserTenants.tsx
index 1a8448c80..db1522c52 100644
--- a/apps/mobile/app/screens/LoginScreen/Components/UserTenants.tsx
+++ b/apps/mobile/app/screens/LoginScreen/Components/UserTenants.tsx
@@ -2,7 +2,7 @@
 /* eslint-disable react-native/no-color-literals */
 /* eslint-disable react-native/no-unused-styles */
 import React, { FC } from "react"
-import { View, Text, StyleSheet, Image } from "react-native"
+import { View, Text, StyleSheet, Image, FlatList } from "react-native"
 import { IWorkspace } from "../../../services/interfaces/IAuthentication"
 import { SvgXml } from "react-native-svg"
 import { grayCircleIcon, greenCircleTickIcon } from "../../../components/svgs/icons"
@@ -57,33 +57,37 @@ const UserTenants: FC<IUserTenants> = ({
 			</View>
 			<View style={{ backgroundColor: "#E5E5E5", height: 1, width: "100%" }} />
 			<View style={{ paddingHorizontal: 10, width: "95%", gap: 5 }}>
-				{data.current_teams.map((team, i) => (
-					<View key={i} style={styles.teamsContainer}>
-						<View style={styles.teamInfoContainer}>
-							<Image
-								source={{ uri: team.team_logo }}
-								style={{ width: 25, height: 25, borderRadius: 100 }}
-							/>
-							<Text style={{ fontSize: 18 }}>
-								{team.team_name}({team.team_member_count})
-							</Text>
+				<FlatList
+					data={data.current_teams}
+					renderItem={({ item }) => (
+						<View style={styles.teamsContainer}>
+							<View style={styles.teamInfoContainer}>
+								<Image
+									source={{ uri: item.team_logo }}
+									style={{ width: 25, height: 25, borderRadius: 100 }}
+								/>
+								<Text style={{ fontSize: 18 }}>
+									{item.team_name}({item.team_member_count})
+								</Text>
+							</View>
+							<View
+								onTouchStart={() => {
+									setActiveTeamId(item.team_id)
+									setSelectedWorkspace(index)
+									setIsValid({ ...isValid, step3: true })
+									setTempAuthToken(data.token)
+								}}
+							>
+								{activeTeamId === item.team_id ? (
+									<SvgXml xml={greenCircleTickIcon} />
+								) : (
+									<SvgXml xml={grayCircleIcon} />
+								)}
+							</View>
 						</View>
-						<View
-							onTouchStart={() => {
-								setActiveTeamId(team.team_id)
-								setSelectedWorkspace(index)
-								setIsValid({ ...isValid, step3: true })
-								setTempAuthToken(data.token)
-							}}
-						>
-							{activeTeamId === team.team_id ? (
-								<SvgXml xml={greenCircleTickIcon} />
-							) : (
-								<SvgXml xml={grayCircleIcon} />
-							)}
-						</View>
-					</View>
-				))}
+					)}
+					keyExtractor={(item, index) => index.toString()}
+				/>
 			</View>
 		</View>
 	)
diff --git a/apps/mobile/app/screens/LoginScreen/index.tsx b/apps/mobile/app/screens/LoginScreen/index.tsx
index 31ca63471..7b8a81e16 100644
--- a/apps/mobile/app/screens/LoginScreen/index.tsx
+++ b/apps/mobile/app/screens/LoginScreen/index.tsx
@@ -42,12 +42,10 @@ export const LoginScreen: FC<LoginScreenProps> = observer(function LoginScreen(_
 
 	return (
 		<Screen
-			preset="scroll"
 			contentContainerStyle={{ ...$screenContentContainer, backgroundColor: "#282149" }}
 			backgroundColor={"#282149"}
 			statusBarStyle={"light"}
 			safeAreaEdges={["top"]}
-			ScrollViewProps={{ bounces: false }}
 			KeyboardAvoidingViewProps={{}}
 		>
 			<View style={$header}>