diff --git a/ios/Podfile b/ios/Podfile
index ac0f289..32e6cf1 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -9,58 +9,24 @@ post_install do |installer|
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
         '$(inherited)',
 
-        ## dart: PermissionGroup.calendar
-        # 'PERMISSION_EVENTS=1',
-        
-        ## dart: PermissionGroup.calendarFullAccess
-        # 'PERMISSION_EVENTS_FULL_ACCESS=1',
-
-        ## dart: PermissionGroup.reminders
-        # 'PERMISSION_REMINDERS=1',
-
-        ## dart: PermissionGroup.contacts
-        # 'PERMISSION_CONTACTS=1',
-
         ## dart: PermissionGroup.camera
         'PERMISSION_CAMERA=1',
 
-        ## dart: PermissionGroup.microphone
-        # 'PERMISSION_MICROPHONE=1',
-
-        ## dart: PermissionGroup.speech
-        # 'PERMISSION_SPEECH_RECOGNIZER=1',
-
-        ## dart: PermissionGroup.photos
-        # 'PERMISSION_PHOTOS=1',
-
         ## The 'PERMISSION_LOCATION' macro enables the `locationWhenInUse` and `locationAlways` permission. If
         ## the application only requires `locationWhenInUse`, only specify the `PERMISSION_LOCATION_WHENINUSE`
         ## macro.
         ##
         ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
-        'PERMISSION_LOCATION=1',
-        'PERMISSION_LOCATION_WHENINUSE=0',
+        'PERMISSION_LOCATION=0',
+        'PERMISSION_LOCATION_WHENINUSE=1',
 
         ## dart: PermissionGroup.notification
         'PERMISSION_NOTIFICATIONS=1',
 
-        ## dart: PermissionGroup.mediaLibrary
-        # 'PERMISSION_MEDIA_LIBRARY=1',
-
-        ## dart: PermissionGroup.sensors
-        # 'PERMISSION_SENSORS=1',
-
-        ## dart: PermissionGroup.bluetooth
-        # 'PERMISSION_BLUETOOTH=1',
-
-        ## dart: PermissionGroup.appTrackingTransparency
-        # 'PERMISSION_APP_TRACKING_TRANSPARENCY=1',
 
         ## dart: PermissionGroup.criticalAlerts
         'PERMISSION_CRITICAL_ALERTS=1',
 
-        ## dart: PermissionGroup.criticalAlerts
-        'PERMISSION_ASSISTANT=1',
       ]
 
     end
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index ad6dcc6..01a14f7 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -28,14 +28,12 @@
 	<true/>
 	<key>NSCameraUsageDescription</key>
 	<string>Camera permission is required for barcode scanning.</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Always and when in use!</string>
-	<key>NSLocationAlwaysUsageDescription</key>
-	<string>Can I have location always?</string>
-	<key>NSLocationUsageDescription</key>
-	<string>Older devices need location.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>Need location when in use</string>
+	<string>Cần vị trí để hiển thị bản đồ hoặc tìm địa điểm gần bạn</string>
+	<key>NSUserNotificationsUsageDescription</key>
+	<string>Chúng tôi cần gửi thông báo khẩn cấp để cảnh báo về việc thiết bị phát hiện có cháy.</string>
+	<key>com.apple.developer.usernotifications.critical-alerts</key>
+	<true/>
 	<key>UIApplicationSupportsIndirectInputEvents</key>
 	<true/>
 	<key>UIBackgroundModes</key>
diff --git a/lib/feature/map/map_screen.dart b/lib/feature/map/map_screen.dart
index bfb173c..46f4709 100644
--- a/lib/feature/map/map_screen.dart
+++ b/lib/feature/map/map_screen.dart
@@ -234,9 +234,9 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
     if (hasStateOne) {
       return flameIcon; // flameIcon
     } else if (hasOtherState) {
-      return normalIcon; // normalIcon
+      return offlineIcon; // normalIcon
     } else {
-      return offlineIcon; // offlineIcon
+      return normalIcon; // offlineIcon
     }
   }
 
@@ -274,16 +274,13 @@ class _MapScreenState extends State<MapScreen> with WidgetsBindingObserver {
     if (response != "") {
       final data = jsonDecode(response);
       List<dynamic> result = data['items'];
-      if(result.isNotEmpty){
+      if (result.isNotEmpty) {
         devices.clear();
         final devicesList = Device.fromJsonDynamicList(result);
         for (var device in devicesList) {
           devices.add(device);
         }
-      }else{
-        
-      }
-
+      } else {}
     }
   }
 
diff --git a/lib/feature/map/widget/on_tap_marker_widget.dart b/lib/feature/map/widget/on_tap_marker_widget.dart
index 8dc8940..bb888bf 100644
--- a/lib/feature/map/widget/on_tap_marker_widget.dart
+++ b/lib/feature/map/widget/on_tap_marker_widget.dart
@@ -163,6 +163,7 @@ onTapMarker(
                       style: const ButtonStyle(
                         backgroundColor: WidgetStatePropertyAll(Colors.red),
                         foregroundColor: WidgetStatePropertyAll(Colors.white),
+                        iconColor: WidgetStatePropertyAll(Colors.white),
                       ),
                       icon: IconConstants.instance
                           .getMaterialIcon(Icons.fire_truck_outlined),