diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart
index ac1b7c1c..0a3ca470 100644
--- a/lib/controllers/api_routes/urls.dart
+++ b/lib/controllers/api_routes/urls.dart
@@ -3,13 +3,13 @@ class URLs {
 
   static const String appReleaseBuildNumber = "51";
 
-  static const host1 = "https://atomsm.hmg.com"; // production url
+  // static const host1 = "https://atomsm.hmg.com"; // production url
   // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url
-  // static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
+  static const host1 = "https://atomsmuat.hmg.com"; // local UAT url
 
-  // static final String _baseUrl = "$_host/mobile"; // host local UAT
+  static final String _baseUrl = "$_host/mobile"; // host local UAT
   // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis
-  static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM
+  // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM
   // static final String _baseUrl = "$_host/v4/mobile"; // v4 for Demo module
   // static final String _baseUrl = "$_host/v5/mobile"; // v5 for data segregation
   // static final String _baseUrl = "$_host/v6/mobile"; // for asset delivery module
diff --git a/lib/modules/asset_delivery_module/helper_function.dart b/lib/modules/asset_delivery_module/helper_function.dart
index 747c34c6..c8948b6f 100644
--- a/lib/modules/asset_delivery_module/helper_function.dart
+++ b/lib/modules/asset_delivery_module/helper_function.dart
@@ -8,6 +8,7 @@ import 'package:test_sa/models/lookup.dart';
 import 'package:test_sa/modules/asset_delivery_module/pages/attachment_view.dart';
 import 'package:test_sa/modules/asset_delivery_module/provider/asset_delivery_provider.dart';
 import 'package:test_sa/modules/asset_delivery_module/provider/attachment_type_provider.dart';
+import 'package:test_sa/new_views/app_style/app_color.dart';
 import 'package:test_sa/new_views/common_widgets/app_lazy_loading.dart';
 import 'package:test_sa/new_views/common_widgets/single_item_drop_down_menu.dart';
 import 'package:test_sa/new_views/swipe_module/dialoge/acknowledge_work_dialog.dart';
@@ -67,7 +68,7 @@ class HelperFunction {
   static Future<Lookup?> showAttachmentTypeBottomSheet(BuildContext context) {
     return showModalBottomSheet<Lookup?>(
       context: context,
-      isScrollControlled: true,
+      isScrollControlled: true,backgroundColor: AppColor.bottomSheetColor(context),
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
       ),
diff --git a/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart b/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart
index 664b4617..43e5a516 100644
--- a/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart
+++ b/lib/modules/asset_delivery_module/pages/asset_delivery_page.dart
@@ -25,6 +25,7 @@ import 'package:test_sa/views/widgets/item_views/info_text_widget.dart';
 
 class AssetDeliveryPage extends StatefulWidget {
   final int? requestId;
+
   // final String? poInternal;
   // final String? poExternal;
 
@@ -144,7 +145,14 @@ class _AssetDeliveryPageState extends State<AssetDeliveryPage> {
                   ],
                 ),
                 16.height,
-                assetDeliveryTableList(context: context, assetDeliveryProvider: provider),
+                Selector<AssetDeliveryProvider, bool>(
+                    selector: (_, provider) => provider.isDeliveryTableListLoading,
+                    builder: (context, isLoading, child) {
+                      return isLoading
+                          ? SizedBox(height: 200.toScreenHeight, child: CircularProgressIndicator(color: AppColor.loadingColor(context)).center)
+                          : assetDeliveryTableList(context: context, assetDeliveryProvider: provider);
+                    })
+                // assetDeliveryTableList(context: context, assetDeliveryProvider: provider),
               ],
             ),
           );
@@ -167,7 +175,7 @@ class _AssetDeliveryPageState extends State<AssetDeliveryPage> {
         //   children: [
         //     Checkbox(
         //       value: dataModel!.isHMG,
-        //       activeColor: AppColor.neutral120,
+        //       activeColor: AppColor.neutral120,x
         //       materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
         //       visualDensity: const VisualDensity(horizontal: -4, vertical: -3),
         //       onChanged: (value) {},
diff --git a/lib/modules/asset_delivery_module/pages/attachment_view.dart b/lib/modules/asset_delivery_module/pages/attachment_view.dart
index 5759ebe8..57d9cecb 100644
--- a/lib/modules/asset_delivery_module/pages/attachment_view.dart
+++ b/lib/modules/asset_delivery_module/pages/attachment_view.dart
@@ -65,7 +65,6 @@ class _AssetDeliveryAttachmentViewState extends State<AssetDeliveryAttachmentVie
 
   @override
   Widget build(BuildContext context) {
-    log('value ${widget.attachmentType}');
     return Scaffold(
       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
       appBar: DefaultAppBar(
@@ -74,12 +73,14 @@ class _AssetDeliveryAttachmentViewState extends State<AssetDeliveryAttachmentVie
           Navigator.pop(context);
         },
       ),
-      body: widget.attachmentList.isEmpty
-          ? const NoDataFound().center
-          : Column(
+      body:
+      // widget.attachmentList.isEmpty
+      //     ? const NoDataFound().center
+      //     :
+      Column(
               children: [
                 Flexible(
-                  fit: FlexFit.loose, // ✅ expands only as much as needed
+                  fit: FlexFit.loose,
                   child: Column(
                     children: [
                       widget.attachmentType == 5 && !widget.viewOnly
diff --git a/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart b/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart
index f62cd62c..14c70c87 100644
--- a/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart
+++ b/lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart
@@ -155,10 +155,10 @@ class _DeliveryInspectionFormViewState extends State<DeliveryInspectionFormView>
                         : Row(
                             children: [
                               AppFilledButton(
-                                  buttonColor: AppColor.white60,
+                                  buttonColor: AppColor.primary10,
                                   label: 'Attachments'.addTranslation,
                                   maxWidth: true,
-                                  textColor: AppColor.black10,
+                                  // textColor: AppColor.black10,
                                   onPressed: () {
                                     HelperFunction.attachmentTap(context: context, viewOnly: true, assetDeliveryProvider: assetDeliveryProvider!, deliveryTableItemId: widget.deliveryTableModel.id);
                                   }).expanded,
diff --git a/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_asset_detail_card.dart b/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_asset_detail_card.dart
index f023c938..20a55189 100644
--- a/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_asset_detail_card.dart
+++ b/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_asset_detail_card.dart
@@ -36,7 +36,7 @@ class EndUserAssetDetailCard extends StatelessWidget {
                   )
                 : const SizedBox(),
             if (!isViewOnly)
-              'edit_icon'.toSvgAsset().onPress(() {
+              'edit_icon'.toSvgAsset(color: AppColor.icon2Color(context)).onPress(() {
                 if (editPress != null) {
                   editPress!();
                 }
diff --git a/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart b/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart
index dc81b8dc..523b51fe 100644
--- a/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart
+++ b/lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart
@@ -111,7 +111,7 @@ class _EndUserCostCenterLIstViewState extends State<EndUserCostCenterLIstView> {
                       : FooterActionButton.footerContainer(
                           context: context,
                           child: AppFilledButton(
-                              buttonColor: AppColor.white60,
+                              buttonColor: AppColor.primary10,
                               label: 'Attachments'.addTranslation,
                               maxWidth: true,
                               textColor: AppColor.black10,
diff --git a/lib/modules/asset_delivery_module/pages/end_user_acceptance/update_end_user_cost_center_details_view.dart b/lib/modules/asset_delivery_module/pages/end_user_acceptance/update_end_user_cost_center_details_view.dart
index ba82f75f..715395be 100644
--- a/lib/modules/asset_delivery_module/pages/end_user_acceptance/update_end_user_cost_center_details_view.dart
+++ b/lib/modules/asset_delivery_module/pages/end_user_acceptance/update_end_user_cost_center_details_view.dart
@@ -147,7 +147,7 @@ class _UpdateEndUserCostCenterDetailsViewState extends State<UpdateEndUserCostCe
         ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
         : ListView.separated(
             itemCount: assetList.length,
-            separatorBuilder: (_, __) => 8.height,
+            separatorBuilder: (_, __) => 12.height,
             padding: EdgeInsets.zero,
             shrinkWrap: true,
             physics: const NeverScrollableScrollPhysics(),
diff --git a/lib/views/widgets/e_signature/e_signature.dart b/lib/views/widgets/e_signature/e_signature.dart
index 63615089..b8a1ead6 100644
--- a/lib/views/widgets/e_signature/e_signature.dart
+++ b/lib/views/widgets/e_signature/e_signature.dart
@@ -93,17 +93,10 @@ class _ESignatureState extends State<ESignature> {
                         crossAxisAlignment: CrossAxisAlignment.start,
                         mainAxisAlignment: MainAxisAlignment.spaceBetween,
                         children: [
-                          widget.title.tinyFont(context).paddingOnly(top: 8),
+                          InfoTextLabelWidget(label: widget.title),
                           (!_editable
-                                  ? "edit".toSvgAsset(width: 48).paddingOnly(top: 8)
-                                  : Container(
-                                      width: 48.toScreenWidth,
-                                      height: 48.toScreenWidth,
-                                      decoration: BoxDecoration(borderRadius: BorderRadius.circular(100), border: Border.all(color: AppColor.neutral30)),
-                                      padding: const EdgeInsets.all(11),
-                                      margin: const EdgeInsets.only(top: 8),
-                                      child: "done".toSvgAsset(width: 26),
-                                    ))
+                                  ? "edit_icon".toSvgAsset(color: AppColor.icon2Color(context))
+                                  : "done".toSvgAsset(width: 24))
                               .onPress(() async {
                             if (_editable) {
                               signature = await _controller!.toPngBytes();