4 files changed, 12 insertions, 7 deletions
diff --git a/src/components/common/BadgeDetailView.tsx b/src/components/common/BadgeDetailView.tsx
index f4271099..32cc7aa4 100644
--- a/src/components/common/BadgeDetailView.tsx
+++ b/src/components/common/BadgeDetailView.tsx
@@ -205,7 +205,7 @@ const BadgeDetailView: React.FC<BadgeDetailModalProps> = ({
 
   return (
     <Modal
-      animationType="slide"
+      animationType="fade"
       transparent
       visible={true}
       presentationStyle="overFullScreen">
diff --git a/src/components/profile/FriendsCount.tsx b/src/components/profile/FriendsCount.tsx
index 18cd1400..8252266e 100644
--- a/src/components/profile/FriendsCount.tsx
+++ b/src/components/profile/FriendsCount.tsx
@@ -62,7 +62,7 @@ const styles = StyleSheet.create({
     fontSize: normalize(14),
   },
   label: {
-    marginTop: 10,
+    marginTop: 4,
     fontWeight: '500',
     fontSize: normalize(14),
   },
diff --git a/src/components/profile/UniversityIcon.tsx b/src/components/profile/UniversityIcon.tsx
index f1451f83..cfe1366d 100644
--- a/src/components/profile/UniversityIcon.tsx
+++ b/src/components/profile/UniversityIcon.tsx
@@ -51,8 +51,8 @@ const styles = StyleSheet.create({
     fontWeight: '500',
   },
   icon: {
-    width: normalize(17),
-    height: normalize(19),
+    width: normalize(12),
+    height: normalize(13),
   },
   shadowStyle: {
     padding: 5,
@@ -63,6 +63,7 @@ const styles = StyleSheet.create({
     },
     shadowOpacity: 1,
     shadowRadius: 3,
+    shadowColor: 'rgba(0, 0, 0, 0.3)',
     backgroundColor: 'white',
   },
 });
diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx
index 0284498d..38a2b01c 100644
--- a/src/screens/badge/BadgeSelection.tsx
+++ b/src/screens/badge/BadgeSelection.tsx
@@ -67,9 +67,13 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => {
         onPress={async () => {
           if (editing) {
             await updateBadgesService(selectedBadges, university);
-            navigation.navigate('UpdateSPPicture', {
-              editing: true,
-            });
+            if (navigation.canGoBack()) {
+              navigation.goBack();
+            } else {
+              navigation.navigate('UpdateSPPicture', {
+                editing: true,
+              });
+            }
           } else {
             if (selectedBadges.length !== 0) {
               const success = await addBadgesService(