diff --git a/lib/ui/cards/white_card.dart b/lib/ui/cards/white_card.dart
index ec79aae..3bc89e1 100644
--- a/lib/ui/cards/white_card.dart
+++ b/lib/ui/cards/white_card.dart
@@ -14,7 +14,7 @@ class WhiteCard extends StatelessWidget {
       width: width, // width == null ? null : width,
       margin: const EdgeInsets.all(8),
       padding: const EdgeInsets.all(10),
-      decoration: buildBoxDecoration(),
+      decoration: buildBoxDecoration(context),
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
@@ -37,9 +37,10 @@ class WhiteCard extends StatelessWidget {
     );
   }
 
-  BoxDecoration buildBoxDecoration() {
+  BoxDecoration buildBoxDecoration(BuildContext context) {
+    final cardColor = Theme.of(context).cardColor;
     return BoxDecoration(
-      color: Colors.white,
+      color: cardColor,
       borderRadius: BorderRadius.circular(5),
       boxShadow: [
         BoxShadow(color: Colors.black.withOpacity(0.05), blurRadius: 5)
diff --git a/lib/ui/views/profile_view.dart b/lib/ui/views/profile_view.dart
index 3610168..2690300 100644
--- a/lib/ui/views/profile_view.dart
+++ b/lib/ui/views/profile_view.dart
@@ -109,6 +109,20 @@ class _ProfileViewForm extends StatelessWidget {
     final citiesProvider = Provider.of<CitiesProvider>(context);
     final cities = citiesProvider.cities;
     final user = profileFormProvider.user!;
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    final textColor = isDark ? Colors.white : Colors.black87;
+
+    // Normaliza el valor actual para que coincida exactamente con la lista
+    final cityNames = cities.map((c) => c.cityName).toList();
+    String? currentCity;
+    if (user.city != null && user.city!.isNotEmpty) {
+      final saved = user.city!.toLowerCase().trim();
+      currentCity = cityNames.firstWhere(
+        (n) => n.toLowerCase().trim() == saved,
+        orElse: () => '',
+      );
+      if (currentCity!.isEmpty) currentCity = null;
+    }
 
     return WhiteCard(
       title: 'Información general',
@@ -169,14 +183,19 @@ class _ProfileViewForm extends StatelessWidget {
               ),
             ),
             const SizedBox(height: 20),
-            DropdownButtonFormField(
+            if (citiesProvider.isLoading)
+              const Padding(
+                padding: EdgeInsets.symmetric(vertical: 16),
+                child: Center(child: CircularProgressIndicator()),
+              )
+            else
+              DropdownButtonFormField<String>(
                 validator: (value) {
-                  if (value == null) {
-                    return 'La ciudad es obligatoria';
-                  }
+                  if (value == null) return 'La ciudad es obligatoria';
                   return null;
                 },
-                value: user.city == '' ? null : user.city,
+                value: currentCity,
+                isExpanded: true,
                 decoration: CustomInputs.formInputDecoration(
                   hint: 'Selecciona tu ciudad',
                   label: 'Ciudad',
@@ -185,16 +204,20 @@ class _ProfileViewForm extends StatelessWidget {
                 items: cities.map((City ciudad) {
                   return DropdownMenuItem<String>(
                     value: ciudad.cityName,
-                    child: Text('${ciudad.cityName} - ${ciudad.stateOfCity}',
-                        style: const TextStyle(
-                          color: Colors.black,
-                          fontWeight: FontWeight.normal,
-                        )),
+                    child: Text(
+                      '${ciudad.cityName} - ${ciudad.stateOfCity}',
+                      style: TextStyle(
+                        color: textColor,
+                        fontWeight: FontWeight.normal,
+                      ),
+                      overflow: TextOverflow.ellipsis,
+                    ),
                   );
                 }).toList(),
                 onChanged: (value) {
-                  profileFormProvider.copyUserWith(city: value!);
-                }),
+                  if (value != null) profileFormProvider.copyUserWith(city: value);
+                },
+              ),
             const SizedBox(height: 20),
             ConstrainedBox(
               constraints: const BoxConstraints(maxWidth: 130),