diff --git a/siro_driver/lib/controller/themes/themes.dart b/siro_driver/lib/controller/themes/themes.dart
index b3285311..f8763c73 100755
--- a/siro_driver/lib/controller/themes/themes.dart
+++ b/siro_driver/lib/controller/themes/themes.dart
@@ -59,7 +59,7 @@ ThemeData _createTheme({
 
 ThemeData lightThemeEnglish = _createTheme(
   brightness: Brightness.light,
-  fontFamily: "SFPro",
+  fontFamily: 'CupertinoSystemText', // Native fallback
   scaffoldBackgroundColor: Colors.white,
   cardColor: Colors.white,
   dividerColor: Colors.black12,
@@ -67,7 +67,7 @@ ThemeData lightThemeEnglish = _createTheme(
 
 ThemeData darkThemeEnglish = _createTheme(
   brightness: Brightness.dark,
-  fontFamily: "SFPro",
+  fontFamily: 'CupertinoSystemText',
   scaffoldBackgroundColor: const Color(0xFF121212),
   cardColor: const Color(0xFF1E1E1E),
   dividerColor: Colors.white10,
@@ -75,7 +75,7 @@ ThemeData darkThemeEnglish = _createTheme(
 
 ThemeData lightThemeArabic = _createTheme(
   brightness: Brightness.light,
-  fontFamily: 'SFArabic',
+  fontFamily: 'CupertinoSystemText',
   scaffoldBackgroundColor: Colors.white,
   cardColor: Colors.white,
   dividerColor: Colors.black12,
@@ -83,7 +83,7 @@ ThemeData lightThemeArabic = _createTheme(
 
 ThemeData darkThemeArabic = _createTheme(
   brightness: Brightness.dark,
-  fontFamily: 'SFArabic',
+  fontFamily: 'CupertinoSystemText',
   scaffoldBackgroundColor: const Color(0xFF121212),
   cardColor: const Color(0xFF1E1E1E),
   dividerColor: Colors.white10,
diff --git a/siro_rider/assets/images/A.png b/siro_rider/assets/images/A.png
index 66080e2c..0015b649 100644
Binary files a/siro_rider/assets/images/A.png and b/siro_rider/assets/images/A.png differ
diff --git a/siro_rider/assets/images/b.png b/siro_rider/assets/images/b.png
index 1798e2cb..1c26e9fc 100644
Binary files a/siro_rider/assets/images/b.png and b/siro_rider/assets/images/b.png differ
diff --git a/siro_rider/assets/images/car.png b/siro_rider/assets/images/car.png
index 8dff5920..ede39722 100644
Binary files a/siro_rider/assets/images/car.png and b/siro_rider/assets/images/car.png differ
diff --git a/siro_rider/assets/images/lady1.png b/siro_rider/assets/images/lady1.png
index 37cc24bf..93475158 100644
Binary files a/siro_rider/assets/images/lady1.png and b/siro_rider/assets/images/lady1.png differ
diff --git a/siro_rider/lib/controller/home/map/ride_lifecycle_controller.dart b/siro_rider/lib/controller/home/map/ride_lifecycle_controller.dart
index ea65b0ba..efeaa5fe 100644
--- a/siro_rider/lib/controller/home/map/ride_lifecycle_controller.dart
+++ b/siro_rider/lib/controller/home/map/ride_lifecycle_controller.dart
@@ -3719,18 +3719,24 @@ class RideLifecycleController extends GetxController {
 
       // بناء الـ markers أولاً ثم وضعها معاً مع polylines في تحديث واحد
       final Set<Marker> newMarkers = {
-        // لا نمرر InfoWindow هنا: صور A/B تحتوي الحرف أصلاً، وأي textField
-        // إضافي يرسم حرفاً مكرراً فوق الدبوس بعد إصلاح الخطوط في الـ SDK.
         Marker(
           markerId: const MarkerId('start'),
           position: startLoc,
           icon: InlqBitmap.fromStyleImage('start_icon'),
+          infoWindow: InfoWindow(
+            title: startNameAddress.split('،').first.trim(),
+            snippet: 'start',
+          ),
           anchor: const Offset(0.5, 1.0),
         ),
         Marker(
           markerId: const MarkerId('end'),
           position: endLoc,
           icon: InlqBitmap.fromStyleImage('end_icon'),
+          infoWindow: InfoWindow(
+            title: endNameAddress.split('،').first.trim(),
+            snippet: 'end',
+          ),
           anchor: const Offset(0.5, 1.0),
         ),
       };
@@ -3745,6 +3751,10 @@ class RideLifecycleController extends GetxController {
             icon: InlqBitmap.fromStyleImage(isFirstWaypoint
                 ? 'start_icon'
                 : 'end_icon'),
+            infoWindow: InfoWindow(
+              title: 'توقف ${i + 1}',
+              snippet: 'stop_$i',
+            ),
             anchor: const Offset(0.5, 1.0),
           ));
         }
diff --git a/siro_rider/lib/controller/themes/themes.dart b/siro_rider/lib/controller/themes/themes.dart
index eec593df..daaf6e76 100644
--- a/siro_rider/lib/controller/themes/themes.dart
+++ b/siro_rider/lib/controller/themes/themes.dart
@@ -5,7 +5,7 @@ import '../../constant/colors.dart';
 
 ThemeData lightThemeEnglish = ThemeData(
   brightness: Brightness.light,
-  fontFamily: "SFPro",
+  fontFamily: 'CupertinoSystemText',
   textTheme: TextTheme(
     displaySmall: AppStyle.title,
     displayLarge: AppStyle.headTitle,
@@ -41,7 +41,7 @@ ThemeData lightThemeEnglish = ThemeData(
 
 ThemeData darkThemeEnglish = ThemeData(
   brightness: Brightness.dark,
-  fontFamily: "SFPro",
+  fontFamily: 'CupertinoSystemText',
   primaryColor: AppColor.primaryColor,
   scaffoldBackgroundColor: const Color(0xFF121212),
   cardColor: const Color(0xFF1E1E1E),
@@ -75,7 +75,7 @@ ThemeData darkThemeEnglish = ThemeData(
 
 ThemeData lightThemeArabic = ThemeData(
   brightness: Brightness.light,
-  fontFamily: 'SFArabic',
+  fontFamily: 'CupertinoSystemText',
   textTheme: TextTheme(
     displaySmall: AppStyle.title,
     displayLarge: AppStyle.headTitle,
@@ -111,7 +111,7 @@ ThemeData lightThemeArabic = ThemeData(
 
 ThemeData darkThemeArabic = ThemeData(
   brightness: Brightness.dark,
-  fontFamily: 'SFArabic',
+  fontFamily: 'CupertinoSystemText',
   primaryColor: AppColor.primaryColor,
   scaffoldBackgroundColor: const Color(0xFF121212),
   cardColor: const Color(0xFF1E1E1E),
diff --git a/siro_rider/pubspec.lock b/siro_rider/pubspec.lock
index ea58b2d8..2812fa4f 100644
--- a/siro_rider/pubspec.lock
+++ b/siro_rider/pubspec.lock
@@ -1296,10 +1296,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+      sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.18"
+    version: "0.12.19"
   material_color_utilities:
     dependency: transitive
     description:
@@ -1312,10 +1312,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.18.0"
   mime:
     dependency: "direct main"
     description:
@@ -1884,10 +1884,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.9"
+    version: "0.7.11"
   timezone:
     dependency: transitive
     description:
diff --git a/siro_rider/pubspec.yaml b/siro_rider/pubspec.yaml
index 131e43f6..1a03ab29 100644
--- a/siro_rider/pubspec.yaml
+++ b/siro_rider/pubspec.yaml
@@ -2,7 +2,7 @@ name: siro_rider
 description: "A new Flutter project."
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
-version: 1.0.0+3
+version: 1.0.5+5
 
 environment:
   sdk: ">=3.0.5 <4.0.0"