diff --git a/lib/screens/medical-file/medical_file_details.dart b/lib/screens/medical-file/medical_file_details.dart
index 431342eb..35705d12 100644
--- a/lib/screens/medical-file/medical_file_details.dart
+++ b/lib/screens/medical-file/medical_file_details.dart
@@ -303,8 +303,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
                                               });
                                             },
                                             child: Icon(isHistoryExpand
-                                                ? EvaIcons.minus
-                                                : EvaIcons.plus))
+                                                ? EvaIcons.arrowUp
+                                                : EvaIcons.arrowDown))
                                       ],
                                     ),
                                     bodyWidget: ListView.builder(
@@ -404,8 +404,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
                                               });
                                             },
                                             child: Icon(isAssessmentExpand
-                                                ? EvaIcons.minus
-                                                : EvaIcons.plus))
+                                                ? EvaIcons.arrowUp
+                                                : EvaIcons.arrowDown))
                                       ],
                                     ),
                                     bodyWidget: ListView.builder(
@@ -584,8 +584,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
                                               });
                                             },
                                             child: Icon(isProcedureExpand
-                                                ? EvaIcons.minus
-                                                : EvaIcons.plus))
+                                                ? EvaIcons.arrowUp
+                                                : EvaIcons.arrowDown))
                                       ],
                                     ),
                                     bodyWidget: ListView.builder(
@@ -758,8 +758,8 @@ class _MedicalFileDetailsState extends State<MedicalFileDetails> {
                                               });
                                             },
                                             child: Icon(isPhysicalExam
-                                                ? EvaIcons.minus
-                                                : EvaIcons.plus))
+                                                ? EvaIcons.arrowUp
+                                                : EvaIcons.arrowDown))
                                       ],
                                     ),
                                     bodyWidget: ListView.builder(
diff --git a/lib/screens/prescription/prescription_screen.dart b/lib/screens/prescription/prescription_screen.dart
index 6e9f0676..f09c99bb 100644
--- a/lib/screens/prescription/prescription_screen.dart
+++ b/lib/screens/prescription/prescription_screen.dart
@@ -630,7 +630,7 @@ class _NewPrescriptionScreenState extends State<NewPrescriptionScreen> {
                                                                             .toString(),
                                                                         patient: patient,
                                                                         drugId: model.prescriptionList[0].entityList[index].medicineCode,
-                                                                        drugName: model.prescriptionList[0].entityList[index].doseDetail,
+                                                                        drugName: model.prescriptionList[0].entityList[index].medicationName,
                                                                         remarks: model.prescriptionList[0].entityList[index].remarks,
                                                                         model: model,
                                                                         enteredRemarks: model.prescriptionList[0].entityList[index].remarks,