diff --git a/app/(application)/announcement/[id].tsx b/app/(application)/announcement/[id].tsx
index a11ac99..f07dca5 100644
--- a/app/(application)/announcement/[id].tsx
+++ b/app/(application)/announcement/[id].tsx
@@ -328,7 +328,7 @@ export default function DetailAnnouncement() {
                      accessibilityLabel="Download or share image"
                      disabled={loadingOpen}
                   >
-                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 22 }}>⋯</Text>
+                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 26 }}>⋯</Text>
                   </Pressable>
                </View>
             )}
diff --git a/app/(application)/announcement/create.tsx b/app/(application)/announcement/create.tsx
index a09acf0..4bacdf6 100644
--- a/app/(application)/announcement/create.tsx
+++ b/app/(application)/announcement/create.tsx
@@ -205,15 +205,16 @@ export default function CreateAnnouncement() {
                {
                   fileForm.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         fileForm.map((item, index) => (
                            <BorderBottomItem
                               key={index}
-                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              borderType={fileForm.length - 1 == index ? "none" : "bottom"}
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
+                              bgColor="transparent"
                               titleWeight="normal"
                               onPress={() => { setIndexDelFile(index); setModalFile(true) }}
                            />
@@ -232,7 +233,7 @@ export default function CreateAnnouncement() {
                {
                   divisionMember.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20' }]}>
                      {
                         divisionMember.map((item: { name: any; Division: any }, index: any) => {
                            return (
diff --git a/app/(application)/announcement/edit/[id].tsx b/app/(application)/announcement/edit/[id].tsx
index 9f9d9e9..6b04ce7 100644
--- a/app/(application)/announcement/edit/[id].tsx
+++ b/app/(application)/announcement/edit/[id].tsx
@@ -258,7 +258,7 @@ export default function EditAnnouncement() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         dataFile.filter((val) => !val.delete).map((item, index) => (
@@ -268,6 +268,7 @@ export default function EditAnnouncement() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name + '.' + item.extension}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
                            />
                         ))
@@ -280,6 +281,7 @@ export default function EditAnnouncement() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
                            />
                         ))
@@ -295,7 +297,7 @@ export default function EditAnnouncement() {
                {
                   dataMember.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20' }]}>
                      {
                         dataMember.map((item: { name: any; Division: any }, index: any) => {
                            return (
diff --git a/app/(application)/announcement/index.tsx b/app/(application)/announcement/index.tsx
index 0c43ee3..c96797d 100644
--- a/app/(application)/announcement/index.tsx
+++ b/app/(application)/announcement/index.tsx
@@ -110,9 +110,10 @@ export default function Announcement() {
                                  key={index}
                                  onPress={() => { router.push(`/announcement/${item.id}`) }}
                                  borderType="bottom"
+                                 bgColor="transparent"
                                  icon={
-                                    <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                       <MaterialIcons name="campaign" size={25} color={'#384288'} />
+                                    <View style={[Styles.iconContent]}>
+                                       <MaterialIcons name="campaign" size={25} color={'black'} />
                                     </View>
                                  }
                                  title={item.title}
diff --git a/app/(application)/discussion/create.tsx b/app/(application)/discussion/create.tsx
index 943f49b..16c3cc2 100644
--- a/app/(application)/discussion/create.tsx
+++ b/app/(application)/discussion/create.tsx
@@ -253,15 +253,16 @@ export default function CreateDiscussionGeneral() {
                {
                   fileForm.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.icon }]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         fileForm.map((item, index) => (
                            <BorderBottomItem
                               key={index}
-                              borderType={fileForm.length > 1 ? "bottom" : "none"}
+                              borderType={fileForm.length - 1 == index ? "none" : "bottom"}
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
+                              bgColor="transparent"
                               titleWeight="normal"
                               onPress={() => { setIndexDelFile(index); setModalFile(true) }}
                            />
@@ -296,17 +297,18 @@ export default function CreateDiscussionGeneral() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round10, Styles.p10, { borderColor: colors.icon }]}>
+                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon + '20' }]}>
                         {
                            entitiesMember.map((item: { img: any; name: any; }, index: any) => {
                               return (
                                  <BorderBottomItem
                                     key={index}
-                                    borderType="bottom"
+                                    borderType={entitiesMember.length - 1 == index ? "none" : "bottom"}
                                     icon={
-                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="sm" />
+                                       <ImageUser src={`${ConstEnv.url_storage}/files/${item.img}`} size="xs" />
                                     }
                                     title={item.name}
+                                    bgColor="transparent"
                                  />
                               )
                            })
diff --git a/app/(application)/discussion/edit/[id].tsx b/app/(application)/discussion/edit/[id].tsx
index 5b1a53e..b96744f 100644
--- a/app/(application)/discussion/edit/[id].tsx
+++ b/app/(application)/discussion/edit/[id].tsx
@@ -229,7 +229,7 @@ export default function EditDiscussionGeneral() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <View>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.icon + '20' }]}>
                      <Text style={[Styles.textDefault]}>File</Text>
                      {
                         dataFile.filter((val) => !val.delete).map((item, index) => (
@@ -239,6 +239,7 @@ export default function EditDiscussionGeneral() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name + '.' + item.extension}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: item.id, cat: "oldFile" }); setModalFile(true) }}
                            />
                         ))
@@ -251,6 +252,7 @@ export default function EditDiscussionGeneral() {
                               icon={<MaterialCommunityIcons name="file-outline" size={25} color={colors.text} />}
                               title={item.name}
                               titleWeight="normal"
+                              bgColor="transparent"
                               onPress={() => { setIndexDelFile({ id: index, cat: "newFile" }); setModalFile(true) }}
                            />
                         ))
diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx
index 9c6c307..3901085 100644
--- a/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/calendar/create-member.tsx
@@ -156,7 +156,7 @@ export default function CreateCalendarAddMember() {
                         return (
                            <Pressable
                               key={index}
-                              style={[Styles.itemSelectModal]}
+                              style={[Styles.itemSelectModal, {borderColor: colors.icon + '20'}]}
                               onPress={() => { onChoose(item.idUser, item.name, item.img) }}
                            >
                               <View style={[Styles.rowItemsCenter, Styles.w70]}>
diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/history.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/history.tsx
index 875bf74..b5fe7a3 100644
--- a/app/(application)/division/[id]/(fitur-division)/calendar/history.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/calendar/history.tsx
@@ -1,7 +1,6 @@
 import InputSearch from "@/components/inputSearch";
 import Skeleton from "@/components/skeleton";
 import Text from "@/components/Text";
-import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetCalendarHistory } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -70,7 +69,7 @@ export default function CalendarHistory() {
          <View>
             <InputSearch onChange={(val) => setSearch(val)} />
          </View>
-         <View style={[{ flex: 2, }]}>
+         <View style={[{ flex: 2 }, Styles.mt10]}>
             {
                loading ?
                   arrSkeleton.map((item, index) => (
@@ -83,7 +82,7 @@ export default function CalendarHistory() {
                      getItem={getItem}
                      renderItem={({ item, index }: { item: Props, index: number }) => {
                         return (
-                           <View key={index} style={[{ flexDirection: 'row' }, Styles.mv05, activeTheme === 'dark' ? { backgroundColor: colors.card } : ColorsStatus.lightGreen, Styles.p10, Styles.round10, { borderBottomWidth: 1, borderColor: colors.background }]}>
+                           <View key={index} style={[{ flexDirection: 'row' }, Styles.mb05, Styles.borderAll, { backgroundColor: colors.card }, Styles.p10, Styles.round05, { borderColor: colors.icon + '20' }]}>
                               <View style={[Styles.mr10, Styles.ph05]}>
                                  <Text style={[Styles.textSubtitle]}>{String(item.dateStart)}</Text>
                                  <Text style={[Styles.textDefault, { textAlign: 'center' }]}>{item.year}</Text>
diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx
index 246d085..29d4087 100644
--- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/edit.tsx
@@ -186,7 +186,7 @@ export default function DiscussionDivisionEdit() {
                {
                   (fileForm.length > 0 || dataFile.filter((val) => !val.delete).length > 0)
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         dataFile.filter((val) => !val.delete).map((item, index) => (
diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
index f073548..ce04db3 100644
--- a/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/[detail]/index.tsx
@@ -297,7 +297,7 @@ export default function DiscussionDetail() {
                      showBack={true}
                      onPressLeft={() => router.back()}
                      right={
-                        (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator ?
+                        ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision || isCreator) ?
                            <HeaderRightDiscussionDetail
                               id={detail}
                               status={data?.status}
diff --git a/app/(application)/division/[id]/(fitur-division)/discussion/create.tsx b/app/(application)/division/[id]/(fitur-division)/discussion/create.tsx
index 1ce6b64..58f2f02 100644
--- a/app/(application)/division/[id]/(fitur-division)/discussion/create.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/discussion/create.tsx
@@ -135,7 +135,7 @@ export default function CreateDiscussionDivision() {
                {
                   fileForm.length > 0
                   &&
-                  <View style={[Styles.borderAll, Styles.round10, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
+                  <View style={[Styles.borderAll, Styles.round05, Styles.p10, Styles.mb10, { borderColor: colors.background, backgroundColor: colors.card }]}>
                      <Text style={[Styles.textDefaultSemiBold]}>File</Text>
                      {
                         fileForm.map((item, index) => (
diff --git a/app/(application)/division/[id]/(fitur-division)/document/index.tsx b/app/(application)/division/[id]/(fitur-division)/document/index.tsx
index 4de1b7b..3aeaf64 100644
--- a/app/(application)/division/[id]/(fitur-division)/document/index.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/document/index.tsx
@@ -382,7 +382,7 @@ export default function DocumentDivision() {
                      showBack={(selectedFiles.length > 0 || dariSelectAll) ? false : true}
                      left={
                         <ButtonHeader
-                           item={<MaterialIcons name="close" size={20} color="white" />}
+                           item={<MaterialIcons name="close" size={25} color="white" />}
                            onPress={() => {
                               handleBatal();
                            }}
@@ -395,7 +395,7 @@ export default function DocumentDivision() {
                         selectedFiles.length > 0 || dariSelectAll ? (
                            <ButtonHeader
                               item={
-                                 <MaterialIcons name="checklist-rtl" size={20} color="white" />
+                                 <MaterialIcons name="checklist-rtl" size={25} color="white" />
                               }
                               onPress={() => {
                                  handleSelectAll();
@@ -495,7 +495,7 @@ export default function DocumentDivision() {
             </View>
          </ScrollView>
          {(selectedFiles.length > 0 || dariSelectAll) && (
-            <View style={[ColorsStatus.primary, Styles.bottomMenuSelectDocument]}>
+            <View style={[Styles.bottomMenuSelectDocument, { backgroundColor: colors.header }]}>
                <View style={[Styles.rowItemsCenter, { justifyContent: "center" }]}>
                   <MenuItemRow
                      icon={
diff --git a/app/(application)/division/[id]/(fitur-division)/task/create.tsx b/app/(application)/division/[id]/(fitur-division)/task/create.tsx
index 098b50e..66b587a 100644
--- a/app/(application)/division/[id]/(fitur-division)/task/create.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/task/create.tsx
@@ -198,7 +198,7 @@ export default function CreateTaskDivision() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round10, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { backgroundColor: colors.card, borderColor: colors.background }]}>
                         {entitiesMember.map(
                            (item: { img: any; name: any }, index: any) => {
                               return (
diff --git a/app/(application)/division/[id]/info.tsx b/app/(application)/division/[id]/info.tsx
index 3b509ed..a9aba24 100644
--- a/app/(application)/division/[id]/info.tsx
+++ b/app/(application)/division/[id]/info.tsx
@@ -13,8 +13,8 @@ import { ConstEnv } from "@/constants/ConstEnv"
 import Styles from "@/constants/Styles"
 import { apiDeleteMemberDivision, apiGetDivisionOneDetail, apiGetDivisionOneFeature, apiUpdateStatusAdminDivision } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { useTheme } from "@/providers/ThemeProvider"
+import { Feather, MaterialCommunityIcons, MaterialIcons } from "@expo/vector-icons"
 import { router, Stack, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
 import { Pressable, RefreshControl, SafeAreaView, ScrollView, View } from "react-native"
@@ -199,7 +199,7 @@ export default function InformationDivision() {
                }
                <View style={[Styles.mb15]}>
                   <Text style={[Styles.textDefaultSemiBold, Styles.mb05]}>Deskripsi Divisi</Text>
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
                      {loading ?
                         arrSkeleton.map((item, index) => {
                            return (
@@ -213,7 +213,7 @@ export default function InformationDivision() {
                </View>
                <View style={[Styles.mb15]}>
                   <Text style={[Styles.textDefault, Styles.mv05]}>{dataMember.length} Anggota</Text>
-                  <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
+                  <View style={[Styles.wrapPaper, Styles.noShadow, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
                      {
                         ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision) &&
                         dataDetail?.isActive && (
@@ -221,8 +221,8 @@ export default function InformationDivision() {
                               onPress={() => { router.push(`/division/${id}/add-member`) }}
                               borderType="none"
                               icon={
-                                 <View style={[Styles.iconContent, ColorsStatus.gray]}>
-                                    <Feather name="user-plus" size={25} color={colors.primary} />
+                                 <View style={[Styles.iconContent]}>
+                                    <Feather name="user-plus" size={25} color={'black'} />
                                  </View>
                               }
                               title="Tambah Anggota"
@@ -262,8 +262,8 @@ export default function InformationDivision() {
             <View>
                <Pressable style={[Styles.wrapItemBorderBottom]} onPress={() => { handleMemberAdmin() }}>
                   <View style={[Styles.rowItemsCenter]}>
-                     <View style={[Styles.iconContent, ColorsStatus.info]}>
-                        <MaterialIcons name="verified-user" size={25} color={colors.primary} />
+                     <View style={[Styles.iconContent]}>
+                        <MaterialIcons name="verified-user" size={25} color={'black'} />
                      </View>
                      <View style={[Styles.rowSpaceBetween, { width: '88%' }]}>
                         <View style={[Styles.ml10]}>
diff --git a/app/(application)/division/index.tsx b/app/(application)/division/index.tsx
index 860beb5..a894e3e 100644
--- a/app/(application)/division/index.tsx
+++ b/app/(application)/division/index.tsx
@@ -7,7 +7,6 @@ import Skeleton from "@/components/skeleton";
 import SkeletonTwoItem from "@/components/skeletonTwoItem";
 import Text from "@/components/Text";
 import WrapTab from "@/components/wrapTab";
-import { ColorsStatus } from "@/constants/ColorsStatus";
 import Styles from "@/constants/Styles";
 import { apiGetDivision } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
@@ -16,8 +15,7 @@ import {
    AntDesign,
    Feather,
    Ionicons,
-   MaterialCommunityIcons,
-   MaterialIcons,
+   MaterialCommunityIcons
 } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
@@ -236,10 +234,10 @@ export default function ListDivision() {
                                        key={index}
                                        onPress={() => { router.push(`/division/${item.id}`) }}
                                        borderType="bottom"
-                                       bgColor={colors.card}
+                                       bgColor="transparent"
                                        icon={
-                                          <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                                             <MaterialIcons name="group" size={25} color={colors.primary} />
+                                          <View style={[Styles.iconContent]}>
+                                             <Feather name="users" size={25} color={'black'} />
                                           </View>
                                        }
                                        title={item.name}
diff --git a/app/(application)/project/create.tsx b/app/(application)/project/create.tsx
index 40bfef6..00fb288 100644
--- a/app/(application)/project/create.tsx
+++ b/app/(application)/project/create.tsx
@@ -322,7 +322,7 @@ export default function CreateProject() {
                         <Text>Total {entitiesMember.length} Anggota</Text>
                      </View>
 
-                     <View style={[Styles.borderAll, Styles.round10, Styles.p10, { borderColor: colors.icon, backgroundColor: colors.card }]}>
+                     <View style={[Styles.borderAll, Styles.round05, Styles.p10, { borderColor: colors.icon, backgroundColor: colors.card }]}>
                         {entitiesMember.map(
                            (item: { img: any; name: any }, index: any) => {
                               return (
diff --git a/components/announcement/headerAnnouncementList.tsx b/components/announcement/headerAnnouncementList.tsx
index d67346f..b44c261 100644
--- a/components/announcement/headerAnnouncementList.tsx
+++ b/components/announcement/headerAnnouncementList.tsx
@@ -23,7 +23,7 @@ export default function HeaderRightAnnouncementList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Pengumuman"
                   onPress={() => {
                      setVisible(false)
diff --git a/components/banner/headerBannerList.tsx b/components/banner/headerBannerList.tsx
index faea4fa..dddea0f 100644
--- a/components/banner/headerBannerList.tsx
+++ b/components/banner/headerBannerList.tsx
@@ -17,7 +17,7 @@ export default function HeaderRightBannerList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={() => setVisible(false)} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Banner"
                   onPress={() => {
                      setVisible(false)
diff --git a/components/borderBottomItem.tsx b/components/borderBottomItem.tsx
index 1b90854..40b06bd 100644
--- a/components/borderBottomItem.tsx
+++ b/components/borderBottomItem.tsx
@@ -56,14 +56,14 @@ export default function BorderBottomItem({ title, subtitle, icon, desc, onPress,
                   {
                      subtitle &&
                         typeof subtitle == "string"
-                        ? <Text style={[Styles.textMediumNormal, { lineHeight: 15, color: textColorFix }]}>{subtitle}</Text>
+                        ? <Text style={[Styles.textMediumNormal, { lineHeight: 15, color: colors.dimmed }]}>{subtitle}</Text>
                         : <View style={{ alignItems: 'flex-start' }}>
                            {subtitle}
                         </View>
                   }
                </View>
                {
-                  rightTopInfo && <Text style={[Styles.textInformation, Styles.mt05, { color: textColorFix }]}>{rightTopInfo}</Text>
+                  rightTopInfo && <Text style={[Styles.textInformation, Styles.mt05, { color: colors.dimmed }]}>{rightTopInfo}</Text>
                }
             </View>
 
diff --git a/components/borderBottomItem2.tsx b/components/borderBottomItem2.tsx
index ba97a81..1af62a6 100644
--- a/components/borderBottomItem2.tsx
+++ b/components/borderBottomItem2.tsx
@@ -215,7 +215,7 @@ export default function BorderBottomItem2({ title, subtitle, icon, desc, onPress
                      accessibilityLabel="Download or share image"
                      disabled={loadingOpen}
                   >
-                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 22 }}>⋯</Text>
+                     <Text style={{ color: loadingOpen ? 'gray' : 'white', fontSize: 26 }}>⋯</Text>
                   </Pressable>
                </View>
             )}
diff --git a/components/calendar/headerCalendarList.tsx b/components/calendar/headerCalendarList.tsx
index daaabf9..7196dd8 100644
--- a/components/calendar/headerCalendarList.tsx
+++ b/components/calendar/headerCalendarList.tsx
@@ -49,7 +49,7 @@ export default function HeaderRightCalendarList() {
                      <></>
                   ) : (
                      <MenuItemRow
-                        icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                        icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                         title="Tambah Acara"
                         onPress={() => {
                            setVisible(false)
diff --git a/components/calendar/itemHistoryEvent.tsx b/components/calendar/itemHistoryEvent.tsx
index b4e9248..5e277a3 100644
--- a/components/calendar/itemHistoryEvent.tsx
+++ b/components/calendar/itemHistoryEvent.tsx
@@ -21,7 +21,7 @@ export default function ItemHistoryEvent({ data }: { data: Props }) {
          {
             data.length > 0 ? (
                data.map((item, index) => (
-                  <View key={index} style={[{ flexDirection: 'row' }, Styles.mv05, activeTheme === 'dark' ? { backgroundColor: colors.card } : ColorsStatus.lightGreen, Styles.p10, Styles.round10, { borderBottomWidth: 1, borderColor: colors.background }]}>
+                  <View key={index} style={[{ flexDirection: 'row' }, Styles.mv05, activeTheme === 'dark' ? { backgroundColor: colors.card } : ColorsStatus.lightGreen, Styles.p10, Styles.round05, { borderBottomWidth: 1, borderColor: colors.background }]}>
                      <View style={[Styles.mr10, Styles.ph05]}>
                         <Text style={[Styles.textSubtitle]}>{String(item.dateStart)}</Text>
                         <Text style={[Styles.textDefault, { textAlign: 'center' }]}>{item.year}</Text>
diff --git a/components/discussion/headerDiscussionList.tsx b/components/discussion/headerDiscussionList.tsx
index d450bb3..e0b9e9a 100644
--- a/components/discussion/headerDiscussionList.tsx
+++ b/components/discussion/headerDiscussionList.tsx
@@ -47,7 +47,7 @@ export default function HeaderRightDiscussionList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Diskusi"
                   onPress={() => {
                      setVisible(false)
diff --git a/components/division/discussionDivisionDetail.tsx b/components/division/discussionDivisionDetail.tsx
index 4ddfe96..f3b3259 100644
--- a/components/division/discussionDivisionDetail.tsx
+++ b/components/division/discussionDivisionDetail.tsx
@@ -1,13 +1,13 @@
 import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
 import { router, useLocalSearchParams } from "expo-router";
 import { useEffect, useState } from "react";
 import { View } from "react-native";
 import Text from "../Text";
 import DiscussionItem from "../discussionItem";
 import Skeleton from "../skeleton";
-import { useTheme } from "@/providers/ThemeProvider";
 
 type Props = {
   id: string;
@@ -54,8 +54,7 @@ export default function DiscussionDivisionDetail({ refreshing }: { refreshing: b
   return (
     <View style={[Styles.mb15]}>
       <Text style={[Styles.textDefaultSemiBold, Styles.mv10]}>Diskusi</Text>
-      <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.background }]}>
-
+      <View style={[Styles.wrapPaper, { backgroundColor: colors.card, borderColor: colors.icon + '20' }, Styles.p0]}>
         {
           loading ?
             <>
diff --git a/components/division/fileDivisionDetail.tsx b/components/division/fileDivisionDetail.tsx
index 781cc97..f106908 100644
--- a/components/division/fileDivisionDetail.tsx
+++ b/components/division/fileDivisionDetail.tsx
@@ -112,8 +112,8 @@ export default function FileDivisionDetail({ refreshing }: { refreshing: boolean
                         data.map((item, index) => (
                            <Pressable style={[Styles.mr05, { width: '24%' }]} key={index} onPress={() => openFile(item)}>
                               <View style={{ alignItems: 'center' }}>
-                                 <View style={[Styles.wrapPaper, { alignItems: 'center' }]}>
-                                    <Feather name="file-text" size={50} color="black" style={Styles.mr05} />
+                                 <View style={[Styles.wrapPaper, { alignItems: 'center', backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]}>
+                                    <Feather name="file-text" size={50} color={colors.text} style={Styles.mr05} />
                                  </View>
                               </View>
                               <View style={[Styles.contentItemCenter]}>
diff --git a/components/division/fiturDivisionDetail.tsx b/components/division/fiturDivisionDetail.tsx
index 6c4e287..ba15e92 100644
--- a/components/division/fiturDivisionDetail.tsx
+++ b/components/division/fiturDivisionDetail.tsx
@@ -2,7 +2,7 @@ import { ColorsStatus } from "@/constants/ColorsStatus"
 import Styles from "@/constants/Styles"
 import { apiGetDivisionOneFeature } from "@/lib/api"
 import { useAuthSession } from "@/providers/AuthProvider"
-import { AntDesign, MaterialIcons, SimpleLineIcons } from "@expo/vector-icons"
+import { AntDesign, Feather, MaterialIcons, SimpleLineIcons } from "@expo/vector-icons"
 import { router, useLocalSearchParams } from "expo-router"
 import { useEffect, useState } from "react"
 import { View } from "react-native"
@@ -56,13 +56,13 @@ export default function FiturDivisionDetail({ refreshing }: { refreshing: boolea
                   bgColor={colors.card}
                   borderType="all"
                   icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <AntDesign name="filetext1" size={25} color={colors.primary} />
+                     <View style={[Styles.p05]}>
+                        <AntDesign name="filetext1" size={28} color={colors.text} />
                      </View>
                   }
                   title="Tugas"
                   subtitle={`${data.tugas} Tugas`}
-                  width={28}
+                  width={30}
                   onPress={() => { router.push(`/division/${id}/task?status=0`) }}
                />
 
@@ -70,13 +70,13 @@ export default function FiturDivisionDetail({ refreshing }: { refreshing: boolea
                   bgColor={colors.card}
                   borderType="all"
                   icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <MaterialIcons name="attach-file" size={25} color={colors.primary} />
+                     <View style={[Styles.p05]}>
+                        <Feather name="paperclip" size={28} color={colors.text} />
                      </View>
                   }
                   title="Dokumen"
                   subtitle={`${data.dokumen} File`}
-                  width={28}
+                  width={30}
                   onPress={() => { router.push(`/division/${id}/document`) }}
                />
             </View>
@@ -86,13 +86,13 @@ export default function FiturDivisionDetail({ refreshing }: { refreshing: boolea
                   bgColor={colors.card}
                   borderType="all"
                   icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <SimpleLineIcons name="bubbles" size={25} color={colors.primary} />
+                     <View style={[Styles.p05]}>
+                        <SimpleLineIcons name="bubbles" size={28} color={colors.text} />
                      </View>
                   }
                   title="Diskusi"
                   subtitle={`${data.diskusi} Diskusi`}
-                  width={28}
+                  width={30}
                   onPress={() => { router.push(`/division/${id}/discussion?active=true`) }}
                />
 
@@ -100,13 +100,13 @@ export default function FiturDivisionDetail({ refreshing }: { refreshing: boolea
                   bgColor={colors.card}
                   borderType="all"
                   icon={
-                     <View style={[Styles.iconContent, ColorsStatus.lightGreen]}>
-                        <AntDesign name="calendar" size={25} color={colors.primary} />
+                     <View style={[Styles.p05]}>
+                        <AntDesign name="calendar" size={28} color={colors.text} />
                      </View>
                   }
                   title="Kalender"
                   subtitle={`${data.kalender} Acara`}
-                  width={28}
+                  width={30}
                   onPress={() => { router.push(`/division/${id}/calendar`) }}
                />
             </View>
diff --git a/components/division/headerDivisionList.tsx b/components/division/headerDivisionList.tsx
index 6d269ce..d5d31b1 100644
--- a/components/division/headerDivisionList.tsx
+++ b/components/division/headerDivisionList.tsx
@@ -25,7 +25,7 @@ export default function HeaderRightDivisionList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Divisi"
                   onPress={() => {
                      setVisible(false)
diff --git a/components/division/taskDivisionDetail.tsx b/components/division/taskDivisionDetail.tsx
index fb385b3..e1ca4c3 100644
--- a/components/division/taskDivisionDetail.tsx
+++ b/components/division/taskDivisionDetail.tsx
@@ -1,13 +1,13 @@
 import Styles from "@/constants/Styles";
 import { apiGetDivisionOneFeature } from "@/lib/api";
 import { useAuthSession } from "@/providers/AuthProvider";
+import { useTheme } from "@/providers/ThemeProvider";
 import { Feather } from "@expo/vector-icons";
 import { router, useLocalSearchParams } from "expo-router";
 import React, { useEffect, useState } from "react";
 import { Dimensions, Pressable, View } from "react-native";
 import { ICarouselInstance } from "react-native-reanimated-carousel";
 import Skeleton from "../skeleton";
-import { useTheme } from "@/providers/ThemeProvider";
 import Text from "../Text";
 
 type Props = {
@@ -59,11 +59,11 @@ export default function TaskDivisionDetail({ refreshing }: { refreshing: boolean
                :
                data.length > 0 ?
                   data.map((item, index) => (
-                     <Pressable key={index} style={[Styles.wrapPaper, Styles.mb05, { backgroundColor: colors.card, borderColor: colors.background }]} onPress={() => { router.push(`/division/${id}/task/${item.idProject}`) }}>
+                     <Pressable key={index} style={[Styles.wrapPaper, Styles.mb10, { backgroundColor: colors.card, borderWidth: 1, borderColor: colors.icon + '20' }]} onPress={() => { router.push(`/division/${id}/task/${item.idProject}`) }}>
                         <Text style={[Styles.textDefaultSemiBold]} numberOfLines={1} ellipsizeMode="tail">{item.title} - {item.projectTitle}</Text>
                         <View style={[Styles.rowItemsCenter, Styles.mt10]}>
-                           <Feather name="clock" size={18} color={colors.text} style={Styles.mr05} />
-                           <Text style={[Styles.textInformation]} numberOfLines={1} ellipsizeMode="tail">{item.dateStart} - {item.dateEnd}</Text>
+                           <Feather name="clock" size={18} color={colors.dimmed} style={Styles.mr05} />
+                           <Text style={[Styles.textInformation, { color: colors.dimmed }]} numberOfLines={1} ellipsizeMode="tail">{item.dateStart} - {item.dateEnd}</Text>
                         </View>
                      </Pressable>
                   ))
diff --git a/components/document/itemFile.tsx b/components/document/itemFile.tsx
index 9d847bd..7515c23 100644
--- a/components/document/itemFile.tsx
+++ b/components/document/itemFile.tsx
@@ -26,13 +26,13 @@ export default function ItemFile({ category, checked, dateTime, title, onChecked
                      ?
                      <>
                         <Ionicons name="folder-open-sharp" color={'#f9cc40'} size={40} />
-                        <MaterialCommunityIcons name="share" color={'gray'} size={25} style={[Styles.absoluteIcon]} />
+                        <MaterialCommunityIcons name="share" color={colors.tint} size={25} style={[Styles.absoluteIcon]} />
                      </>
                      : category == 'file-shared'
                         ?
                         <>
                            <Ionicons name="document-text-sharp" color={'#9fcff8'} size={40} />
-                           <MaterialCommunityIcons name="share" color={'gray'} size={25} style={[Styles.absoluteIcon]} />
+                           <MaterialCommunityIcons name="share" color={colors.tint} size={25} style={[Styles.absoluteIcon]} />
                         </>
                         :
                         category == 'folder'
@@ -47,8 +47,8 @@ export default function ItemFile({ category, checked, dateTime, title, onChecked
             </Pressable>
             <View style={[Styles.rowSpaceBetween, { flex: 1, alignItems: 'center' }]}>
                <Pressable style={[Styles.ml10, { flex: 1 },]} onPress={onPress}>
-                  <Text style={[Styles.textDefault]} numberOfLines={1} ellipsizeMode="tail">{title}</Text>
-                  <Text style={[Styles.textInformation]}>{dateTime}</Text>
+                  <Text style={[Styles.textDefault, { color: colors.text }]} numberOfLines={1} ellipsizeMode="tail">{title}</Text>
+                  <Text style={[Styles.textInformation, { color: colors.dimmed }]}>{dateTime}</Text>
                </Pressable>
                {
                   !canChecked ? <></>
diff --git a/components/document/modalSalinMove.tsx b/components/document/modalSalinMove.tsx
index e39081d..9622c0f 100644
--- a/components/document/modalSalinMove.tsx
+++ b/components/document/modalSalinMove.tsx
@@ -94,6 +94,7 @@ export default function ModalSalinMove({ open, close, category, onConfirm, dataC
                            icon={<Ionicons name="folder-open-sharp" style={[found ? Styles.cGray : Styles.cFolder]} size={30} />}
                            title={item.name}
                            titleWeight="normal"
+                           bgColor="transparent"
                            onPress={() => {
                               if (found) return;
                               setPath(item.id);
@@ -108,7 +109,7 @@ export default function ModalSalinMove({ open, close, category, onConfirm, dataC
                   <Text style={[Styles.textDefault, Styles.cGray, Styles.mt15, { textAlign: 'center' }]}>Tidak ada data</Text>
             }
          </View>
-         <View style={[Styles.rowOnly, Styles.mt15, Styles.absolute0, { backgroundColor: colors.background }]}>
+         <View style={[Styles.rowOnly, Styles.mt15, Styles.absolute0, { backgroundColor: colors.modalBackground }]}>
             <ModalNewFolder path={path} onCreated={() => getData()} />
             <Pressable style={[Styles.pv05, { width: '50%' }]} onPress={() => onConfirm(path)}>
                <Text style={[Styles.textDefaultSemiBold, { textAlign: 'center' }]}>{category == 'copy' ? 'SALIN' : 'PINDAH'}</Text>
diff --git a/components/eventItem.tsx b/components/eventItem.tsx
index 7ca758a..e780786 100644
--- a/components/eventItem.tsx
+++ b/components/eventItem.tsx
@@ -13,18 +13,25 @@ type Props = {
 }
 
 export default function EventItem({ category, title, user, jamAwal, jamAkhir, onPress }: Props) {
-   const { theme } = useTheme();
+   const { theme, colors } = useTheme();
 
    const getBackgroundColor = (cat: 'purple' | 'orange') => {
       if (theme === 'dark') {
-         return cat === 'orange' ? '#5A2D0C' : '#1F2255';
+         return cat === 'orange' ? '#547792' : '#1D546D';
       }
-      return cat === 'orange' ? '#FED6C5' : '#D8D8F1';
+      return cat === 'orange' ? '#D6E6F2' : '#A9B5DF';
+   };
+
+   const getStickColor = (cat: 'purple' | 'orange') => {
+      if (theme === 'dark') {
+         return cat === 'orange' ? '#94B4C1' : '#5F9598';
+      }
+      return cat === 'orange' ? '#F5F5F5' : '#7886C7' ;
    };
 
    return (
       <Pressable style={[Styles.itemEvent, { backgroundColor: getBackgroundColor(category) }]} onPress={onPress}>
-         <View style={[Styles.dividerEvent, { backgroundColor: category == 'orange' ? '#FB804C' : '#535FCA' }]} />
+         <View style={[Styles.dividerEvent, { backgroundColor: getStickColor(category) }]} />
          <View style={[Styles.w90]}>
             <Text>{jamAwal} - {jamAkhir}</Text>
             <Text numberOfLines={1} ellipsizeMode="tail" style={[Styles.textDefaultSemiBold, Styles.mv05]}>{title}</Text>
diff --git a/components/inputDate.tsx b/components/inputDate.tsx
index c5898d2..afa82f9 100644
--- a/components/inputDate.tsx
+++ b/components/inputDate.tsx
@@ -80,17 +80,17 @@ export function InputDate({ label, value, placeholder, onChange, info, disable,
          <View style={[Styles.mb10]}>
             {
                label != undefined && (
-                  <Text style={[Styles.mb05, error && Styles.cError]}>
+                  <Text style={[Styles.mb05, error && { color: colors.error }]}>
                      {label}
-                     {required && (<Text style={Styles.cError}>*</Text>)}
+                     {required && (<Text style={{ color: colors.error }}>*</Text>)}
                   </Text>
                )
             }
-            <Pressable style={[Styles.inputRoundForm, disable && ColorsStatus.gray, error && { borderColor: "red" }, { backgroundColor: colors.card }]} onPress={() => setModal(true)} disabled={disable}>
-               <Text style={!value && [Styles.cGray]}>{value ? value : placeholder}</Text>
+            <Pressable style={[Styles.inputRoundForm, disable && ColorsStatus.gray, { borderColor: colors.icon + '20' }, error && { borderColor: colors.error }, { backgroundColor: colors.card }]} onPress={() => setModal(true)} disabled={disable}>
+               <Text style={!value && [{ color: colors.dimmed }]}>{value ? value : placeholder}</Text>
             </Pressable>
-            {error && (<Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>{errorText}</Text>)}
-            {info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, Styles.cGray]}>{info}</Text>)}
+            {error && (<Text style={[Styles.textInformation, { color: colors.error }, Styles.mt05]}>{errorText}</Text>)}
+            {info != undefined && (<Text style={[Styles.textInformation, Styles.mt05, { color: colors.icon }]}>{info}</Text>)}
          </View>
          {
             Platform.OS === 'ios' ? (
diff --git a/components/inputSearch.tsx b/components/inputSearch.tsx
index 3418b8e..3a930d8 100644
--- a/components/inputSearch.tsx
+++ b/components/inputSearch.tsx
@@ -2,7 +2,7 @@ import { useTheme } from "@/providers/ThemeProvider";
 import { Feather } from "@expo/vector-icons";
 import { InputForm } from "./inputForm";
 
-export default function InputSearch({ onChange, width, value }: { onChange?: (val: string) => void, width?: number, value?: string }) {
+export default function InputSearch({ onChange, width, value, bg }: { onChange?: (val: string) => void, width?: number, value?: string, bg?: string }) {
    const { colors } = useTheme();
    return (
       <InputForm
@@ -12,7 +12,7 @@ export default function InputSearch({ onChange, width, value }: { onChange?: (va
          itemLeft={<Feather name="search" size={20} color={colors.dimmed} />}
          onChange={onChange}
          width={width}
-         bg="white"
+         bg={bg}
          value={value}
          mb={false}
       />
diff --git a/components/labelStatus.tsx b/components/labelStatus.tsx
index 6e1430e..85f6160 100644
--- a/components/labelStatus.tsx
+++ b/components/labelStatus.tsx
@@ -24,7 +24,7 @@ export default function LabelStatus({ category, text, size, style }: Props) {
       <View style={[
          size == "small" ? Styles.labelStatusSmall : Styles.labelStatus,
          { backgroundColor },
-         Styles.round10,
+         Styles.round05,
          Styles.contentItemCenter,
          style
       ]}>
diff --git a/components/modalFloat.tsx b/components/modalFloat.tsx
index 94ff13c..4366d28 100644
--- a/components/modalFloat.tsx
+++ b/components/modalFloat.tsx
@@ -35,10 +35,10 @@ export default function ModalFloat({ isVisible, setVisible, title, children, onS
             {
                !buttonHide && (
                   <View style={[Styles.rowItemsCenter, { justifyContent: 'flex-end' }]}>
-                     <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10, Styles.mr10]} onPress={() => { setVisible(false) }}>
+                     <Pressable style={[Styles.ph15, Styles.pv05, Styles.round05, Styles.mr10]} onPress={() => { setVisible(false) }}>
                         <Text style={[Styles.textDefaultSemiBold]}>Batal</Text>
                      </Pressable>
-                     <Pressable style={[Styles.ph15, Styles.pv05, Styles.round10]} onPress={onSubmit} disabled={disableSubmit}>
+                     <Pressable style={[Styles.ph15, Styles.pv05, Styles.round05]} onPress={onSubmit} disabled={disableSubmit}>
                         <Text style={[Styles.textDefaultSemiBold, disableSubmit && Styles.cGray]}>Simpan</Text>
                      </Pressable>
                   </View>
diff --git a/components/modalSelect.tsx b/components/modalSelect.tsx
index 6ab2eff..a0e6b19 100644
--- a/components/modalSelect.tsx
+++ b/components/modalSelect.tsx
@@ -132,7 +132,7 @@ export default function ModalSelect({ open, close, title, category, idParent, on
          {
             category == 'member' &&
             <>
-               <InputSearch onChange={setSearch} value={search} />
+               <InputSearch onChange={setSearch} value={search} bg={"transparent"} />
                {
                   selectMember.length > 0
                      ?
diff --git a/components/modalSelectMultiple.tsx b/components/modalSelectMultiple.tsx
index caa7c46..7d74763 100644
--- a/components/modalSelectMultiple.tsx
+++ b/components/modalSelectMultiple.tsx
@@ -163,7 +163,7 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
                                  <Text numberOfLines={1} style={[Styles.w80]}>{item.name}</Text>
                                  {
                                     selectedDivision.some((i: any) => i.id == item.id)
-                                       ? <AntDesign name="check" size={18} color={colors.text} />
+                                       ? <AntDesign name="check" size={17} color={colors.text} />
                                        : <></>
                                  }
                               </Pressable>
@@ -179,9 +179,9 @@ export default function ModalSelectMultiple({ open, close, title, category, choo
                               <Text style={[Styles.textMediumSemiBold]}>{item.name}</Text>
                               {
                                  checked[item.id] && checked[item.id]?.length === item.Division?.length
-                                    ? <AntDesign name="check" size={20} color={colors.text} />
+                                    ? <AntDesign name="check" size={17} color={colors.text} />
                                     : (checked[item.id] && checked[item.id]?.length > 0 && checked[item.id]?.length < item.Division?.length)
-                                       ? <AntDesign name="minus" size={20} color={colors.text} />
+                                       ? <AntDesign name="minus" size={17} color={colors.text} />
                                        : <></>
                               }
                            </Pressable>
diff --git a/components/project/headerProjectDetail.tsx b/components/project/headerProjectDetail.tsx
index efbb433..6a9853a 100644
--- a/components/project/headerProjectDetail.tsx
+++ b/components/project/headerProjectDetail.tsx
@@ -72,7 +72,7 @@ export default function HeaderRightProjectDetail({ id, status }: Props) {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={35}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Tugas"
                   onPress={() => {
                      if (status == 3) return
diff --git a/components/project/headerProjectList.tsx b/components/project/headerProjectList.tsx
index ddb23ef..4510448 100644
--- a/components/project/headerProjectList.tsx
+++ b/components/project/headerProjectList.tsx
@@ -24,7 +24,7 @@ export default function HeaderRightProjectList() {
                {
                   entityUser.role != "user" && entityUser.role != "coadmin" &&
                   <MenuItemRow
-                     icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                     icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                      title="Tambah Kegiatan"
                      onPress={() => {
                         setVisible(false)
diff --git a/components/sectionCancel.tsx b/components/sectionCancel.tsx
index e5d9a94..0aa6042 100644
--- a/components/sectionCancel.tsx
+++ b/components/sectionCancel.tsx
@@ -14,7 +14,7 @@ export default function SectionCancel({ text, title }: Props) {
    const { colors } = useTheme();
 
    return (
-      <View style={[Styles.p10, Styles.round10, Styles.mb15, { backgroundColor: colors.card }]}>
+      <View style={[Styles.p10, Styles.round05, Styles.mb15, { backgroundColor: colors.card }]}>
          <View style={[Styles.rowItemsCenter]}>
             <AntDesign name="warning" size={22} style={[Styles.mr10]} color={colors.text} />
             <Text style={[Styles.textDefaultSemiBold]}>{title ? title : 'Kegiatan Dibatalkan'}</Text>
diff --git a/components/task/headerTaskDetail.tsx b/components/task/headerTaskDetail.tsx
index 8081b30..7f001f0 100644
--- a/components/task/headerTaskDetail.tsx
+++ b/components/task/headerTaskDetail.tsx
@@ -74,7 +74,7 @@ export default function HeaderRightTaskDetail({ id, division, status, isAdminDiv
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu" height={35}>
             <View style={Styles.rowItemsCenter}>
                <MenuItemRow
-                  icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                  icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                   title="Tambah Tugas"
                   onPress={() => {
                      if (status == 3) return
diff --git a/components/task/headerTaskList.tsx b/components/task/headerTaskList.tsx
index b2ab7e6..ff7add2 100644
--- a/components/task/headerTaskList.tsx
+++ b/components/task/headerTaskList.tsx
@@ -51,10 +51,10 @@ export default function HeaderRightTaskList() {
          <DrawerBottom animation="slide" isVisible={isVisible} setVisible={setVisible} title="Menu">
             <View style={Styles.rowItemsCenter}>
                {
-                  (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision
+                  ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision)
                   &&
                   <MenuItemRow
-                     icon={<AntDesign name="pluscircle" color={colors.text} size={25} />}
+                     icon={<AntDesign name="pluscircleo" color={colors.text} size={25} />}
                      title="Tambah Tugas Divisi"
                      onPress={() => {
                         setVisible(false)
diff --git a/components/task/sectionMemberTask.tsx b/components/task/sectionMemberTask.tsx
index 612a2c4..dd2c522 100644
--- a/components/task/sectionMemberTask.tsx
+++ b/components/task/sectionMemberTask.tsx
@@ -170,7 +170,7 @@ export default function SectionMemberTask({ refreshing, isAdminDivision }: { ref
 
 
                {
-                  (entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision
+                  ((entityUser.role != "user" && entityUser.role != "coadmin") || isAdminDivision)
                      ?
                      <MenuItemRow
                         icon={
diff --git a/constants/Styles.ts b/constants/Styles.ts
index 94fa672..9c336d0 100644
--- a/constants/Styles.ts
+++ b/constants/Styles.ts
@@ -196,6 +196,9 @@ const Styles = StyleSheet.create({
    pv20: {
       paddingVertical: 20
    },
+   p05: {
+      padding: 5
+   },
    p15: {
       padding: 15
    },
@@ -398,8 +401,8 @@ const Styles = StyleSheet.create({
    contentPaperGrid2: {
       backgroundColor: 'white',
       height: 100,
-      borderBottomEndRadius: 15,
-      borderBottomStartRadius: 15,
+      borderBottomEndRadius: 5,
+      borderBottomStartRadius: 5,
       paddingHorizontal: 20,
       paddingVertical: 15,
       justifyContent: 'flex-start'
@@ -428,6 +431,13 @@ const Styles = StyleSheet.create({
       shadowRadius: 4,
       elevation: 5,
    },
+   noShadow: {
+      shadowColor: 'transparent',
+      shadowOffset: { width: 0, height: 0 },
+      shadowOpacity: 0,
+      shadowRadius: 0,
+      elevation: 0,
+   },
    contentItemCenter: {
       justifyContent: 'center',
       alignItems: 'center'
@@ -459,8 +469,8 @@ const Styles = StyleSheet.create({
       padding: 10,
       borderColor: '#d6d8f6',
       borderWidth: 1,
-      borderRadius: 10,
-      marginBottom: 5
+      borderRadius: 5,
+      marginBottom: 10
    },
    wrapItemBorderNone: {
       padding: 10,