diff --git a/app/Http/Controllers/FamilyController.php b/app/Http/Controllers/FamilyController.php
index f4421b5..232bc61 100644
--- a/app/Http/Controllers/FamilyController.php
+++ b/app/Http/Controllers/FamilyController.php
@@ -474,46 +474,51 @@ class FamilyController extends Controller
     public function uploadFamilyMemberPicture(Request $request, $id)
     {
         $request->validate([
-            'image' => 'required|image|mimes:jpeg,png,jpg,gif|max:5120', // 5MB max
+            'image' => 'required',
+            'folder' => 'required|string',
+            'filename' => 'required|string',
         ]);
 
-        $user = Auth::user();
+        try {
+            $user = Auth::user();
 
-        // Verify the family member belongs to the authenticated user
-        $relationship = UserRelationship::where('guardian_user_id', $user->id)
-            ->where('dependent_user_id', $id)
-            ->firstOrFail();
+            // Verify the family member belongs to the authenticated user
+            $relationship = UserRelationship::where('guardian_user_id', $user->id)
+                ->where('dependent_user_id', $id)
+                ->firstOrFail();
 
-        $familyMember = User::findOrFail($id);
+            $familyMember = User::findOrFail($id);
 
-        if ($request->hasFile('image')) {
-            $image = $request->file('image');
+            // Handle base64 image from cropper
+            $imageData = $request->image;
+            $imageParts = explode(";base64,", $imageData);
+            $imageTypeAux = explode("image/", $imageParts[0]);
+            $extension = $imageTypeAux[1];
+            $imageBinary = base64_decode($imageParts[1]);
 
-            // Generate unique filename
-            $filename = 'profile_' . $familyMember->id . '_' . time() . '.' . $image->getClientOriginalExtension();
-
-            // Store in public/images/profiles
-            $path = $image->storeAs('images/profiles', $filename, 'public');
+            $folder = trim($request->folder, '/');
+            $fileName = $request->filename . '.' . $extension;
+            $fullPath = $folder . '/' . $fileName;
 
             // Delete old profile picture if exists
             if ($familyMember->profile_picture && \Storage::disk('public')->exists($familyMember->profile_picture)) {
                 \Storage::disk('public')->delete($familyMember->profile_picture);
             }
 
-            // Update family member
-            $familyMember->update(['profile_picture' => $path]);
+            // Store in the public disk (storage/app/public)
+            \Storage::disk('public')->put($fullPath, $imageBinary);
+
+            // Update family member's profile_picture field
+            $familyMember->update(['profile_picture' => $fullPath]);
 
             return response()->json([
                 'success' => true,
-                'message' => 'Profile picture uploaded successfully.',
-                'path' => $path,
+                'path' => $fullPath,
+                'url' => asset('storage/' . $fullPath)
             ]);
+        } catch (\Exception $e) {
+            return response()->json(['success' => false, 'message' => $e->getMessage()], 500);
         }
-
-        return response()->json([
-            'success' => false,
-            'message' => 'No image file provided.',
-        ], 400);
     }
 
     /**
diff --git a/resources/views/family/dashboard.blade.php b/resources/views/family/dashboard.blade.php
index 6e4d597..be5a63b 100644
--- a/resources/views/family/dashboard.blade.php
+++ b/resources/views/family/dashboard.blade.php
@@ -20,8 +20,8 @@
                         <div class="d-flex align-items-start gap-3">
                             <div class="position-relative">
                                 <div class="rounded-circle border border-4 border-white shadow" style="width: 80px; height: 80px; overflow: hidden; box-shadow: 0 0 0 2px {{ $relationship->dependent->gender == 'm' ? 'rgba(147, 51, 234, 0.3)' : 'rgba(214, 51, 132, 0.3)' }} !important;">
-                                @if($relationship->dependent->media_gallery[0] ?? false)
-                                    <img src="{{ $relationship->dependent->media_gallery[0] }}" alt="{{ $relationship->dependent->full_name }}" class="w-100 h-100" style="object-fit: cover;">
+                                @if($relationship->dependent->profile_picture)
+                                    <img src="{{ asset('storage/' . $relationship->dependent->profile_picture) }}" alt="{{ $relationship->dependent->full_name }}" class="w-100 h-100" style="object-fit: cover;">
                                 @else
                                     <div class="w-100 h-100 d-flex align-items-center justify-content-center text-white fw-bold fs-4" style="background: linear-gradient(135deg, {{ $relationship->dependent->gender == 'm' ? '#8b5cf6 0%, #7c3aed 100%' : '#d63384 0%, #a61e4d 100%' }});">
                                         {{ strtoupper(substr($relationship->dependent->full_name, 0, 1)) }}
diff --git a/resources/views/family/edit.blade.php b/resources/views/family/edit.blade.php
index d1276d3..fed2c0a 100644
--- a/resources/views/family/edit.blade.php
+++ b/resources/views/family/edit.blade.php
@@ -12,14 +12,27 @@
                     <!-- Profile Picture Section -->
                     <div class="mb-4 text-center">
                         <div class="mb-3">
-                            <img src="{{ $relationship->dependent->profile_picture ? asset('storage/' . $relationship->dependent->profile_picture) : asset('images/default-avatar.png') }}"
-                                 alt="Profile Picture"
-                                 class="rounded-circle"
-                                 style="width: 120px; height: 120px; object-fit: cover; border: 3px solid #dee2e6;">
+                            @if($relationship->dependent->profile_picture)
+                                <img src="{{ asset('storage/' . $relationship->dependent->profile_picture) }}"
+                                     alt="Profile Picture"
+                                     class="rounded-circle"
+                                     style="width: 120px; height: 120px; object-fit: cover; border: 3px solid #dee2e6;">
+                            @else
+                                <div class="rounded-circle d-inline-flex align-items-center justify-content-center text-white fw-bold"
+                                     style="width: 120px; height: 120px; font-size: 3rem; background: linear-gradient(135deg, {{ $relationship->dependent->gender == 'm' ? '#0d6efd 0%, #0a58ca 100%' : '#d63384 0%, #a61e4d 100%' }}); border: 3px solid #dee2e6;">
+                                    {{ strtoupper(substr($relationship->dependent->full_name, 0, 1)) }}
+                                </div>
+                            @endif
                         </div>
-                        <button type="button" class="btn btn-outline-primary btn-sm" data-bs-toggle="modal" data-bs-target="#profilePictureModal">
-                            <i class="fas fa-camera"></i> Change Profile Picture
-                        </button>
+                        <x-takeone-cropper
+                            id="family_member_{{ $relationship->dependent->id }}"
+                            width="300"
+                            height="400"
+                            shape="square"
+                            folder="images/profiles"
+                            filename="profile_{{ $relationship->dependent->id }}"
+                            uploadUrl="{{ route('family.upload-picture', $relationship->dependent->id) }}"
+                        />
                     </div>
 
                     <form method="POST" action="{{ route('family.update', $relationship->dependent->id) }}">
@@ -246,14 +259,6 @@
         </div>
     </div>
 
-    <!-- Profile Picture Upload Modal -->
-    <x-image-upload-modal
-        id="profilePictureModal"
-        aspectRatio="1"
-        maxSizeMB="1"
-        title="Upload Profile Picture"
-        uploadUrl="{{ route('family.upload-picture', $relationship->dependent->id) }}"
-    />
 </div>
 
 <script>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index c6d1f51..e829a57 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -279,6 +279,22 @@
         .nav-icon-btn.dropdown-toggle::after {
             display: none;
         }
+
+        /* Vertical alignment fix for navbar items */
+        .navbar-nav {
+            display: flex;
+            align-items: center;
+        }
+
+        .navbar-nav .nav-item {
+            display: flex;
+            align-items: center;
+        }
+
+        .navbar-nav .nav-link {
+            display: flex;
+            align-items: center;
+        }
     </style>
 
     @stack('styles')