diff --git a/lib/common/widgets/button.dart b/lib/common/widgets/button.dart
index 056c4c2..b9a3a86 100644
--- a/lib/common/widgets/button.dart
+++ b/lib/common/widgets/button.dart
@@ -47,7 +47,7 @@ class ButtonWidget extends StatelessWidget {
               BoldTextWidget(
                 title,
                 fontSize: fontSize,
-                color: Colors.white,
+                color: textColor ?? Colors.white,
               ).paddingSymmetric(horizontal: 10),
             ])
           : isLoading!
@@ -63,7 +63,7 @@ class ButtonWidget extends StatelessWidget {
                         title,
                         fontSize: fontSize,
                         textAlign: TextAlign.center,
-                        color: Colors.white,
+                        color: textColor ?? Colors.white,
                       ).paddingSymmetric(horizontal: 20),
                     ),
                     SizedBox(
@@ -79,7 +79,7 @@ class ButtonWidget extends StatelessWidget {
                   title,
                   fontSize: fontSize,
                   textAlign: TextAlign.center,
-                  color: Colors.white,
+                  color: textColor ?? Colors.white,
                 ),
     ).onTap(() {
       if (isLoading == null || !isLoading!) onTap();
diff --git a/lib/common/widgets/header_screen.dart b/lib/common/widgets/header_screen.dart
index 60a5c0f..3acee5a 100644
--- a/lib/common/widgets/header_screen.dart
+++ b/lib/common/widgets/header_screen.dart
@@ -22,23 +22,26 @@ class HeaderScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return Row(
       children: [
-        Obx(() => (!homeController.isArabic.value)
-            ? SvgPicture.asset(
-                "assets/icons/arrow-left.svg",
-                width: Responsive.isTablet() ? 25 : null,
-                colorFilter: (iconColor != null)
-                    ? ColorFilter.mode(iconColor!, BlendMode.srcIn)
-                    : null,
-              )
-            : SvgPicture.asset(
-                "assets/icons/arrow right.svg",
-                width: Responsive.isTablet() ? 20 : null,
-                colorFilter: (iconColor != null)
-                    ? ColorFilter.mode(iconColor!, BlendMode.srcIn)
-                    : null,
-              )).onTap(() {
-          RoutingManager.back();
-        }),
+        SizedBox(
+          width: 24,
+          child: Obx(() => (!homeController.isArabic.value)
+              ? SvgPicture.asset(
+                  "assets/icons/arrow-left.svg",
+                  width: Responsive.isTablet() ? 25 : null,
+                  colorFilter: (iconColor != null)
+                      ? ColorFilter.mode(iconColor!, BlendMode.srcIn)
+                      : null,
+                )
+              : SvgPicture.asset(
+                  "assets/icons/arrow right.svg",
+                  width: Responsive.isTablet() ? 20 : null,
+                  colorFilter: (iconColor != null)
+                      ? ColorFilter.mode(iconColor!, BlendMode.srcIn)
+                      : null,
+                )).onTap(() {
+            RoutingManager.back();
+          }),
+        ),
         BoldTextWidget(
           title,
           fontSize: Responsive.isTablet() ? 24 : 18,
diff --git a/lib/features/chat/presentation_layer/widgets/new_voice_message.dart b/lib/features/chat/presentation_layer/widgets/new_voice_message.dart
index 6a76f07..1128ace 100644
--- a/lib/features/chat/presentation_layer/widgets/new_voice_message.dart
+++ b/lib/features/chat/presentation_layer/widgets/new_voice_message.dart
@@ -50,7 +50,7 @@ class NewVoiceMessage extends StatelessWidget {
         key: dismissibleKey,
         onDismissed: null,
         child: SizedBox(
-          width: Get.width * 0.6,
+          width: Get.width * 0.58,
           height: 70,
           child: Container(
             decoration: BoxDecoration(
@@ -214,12 +214,12 @@ class NewVoiceMessage extends StatelessWidget {
                               : const PlayerWaveStyle(),
                           waveformData: Constants.defaulWaveFormData,
                           size: homeController.isArabic.value
-                              ? const Size(139, 30.0)
-                              : const Size(149, 30.0),
+                              ? const Size(118, 30.0)
+                              : const Size(130, 30.0),
                           waveformType: WaveformType.long,
                           playerController: playerController,
                         ).paddingOnly(
-                          left: homeController.isArabic.value ? 18 : 8,
+                          left: homeController.isArabic.value ? 4 : 8,
                         ),
                       ),
                       Visibility(
@@ -239,13 +239,13 @@ class NewVoiceMessage extends StatelessWidget {
                                     )
                                   : const PlayerWaveStyle(),
                               size: homeController.isArabic.value
-                                  ? const Size(139, 30.0)
-                                  : const Size(159, 30.0),
+                                  ? const Size(118, 30.0)
+                                  : const Size(130, 30.0),
                               waveformType: WaveformType.long,
                               playerController: playerController,
                               enableSeekGesture: false,
                             ).paddingOnly(
-                              left: homeController.isArabic.value ? 18 : 8,
+                              left: homeController.isArabic.value ? 4 : 8,
                             );
                           } on Exception {
                             return AudioFileWaveforms(
@@ -261,12 +261,12 @@ class NewVoiceMessage extends StatelessWidget {
                               enableSeekGesture: false,
                               waveformData: Constants.defaulWaveFormData,
                               size: homeController.isArabic.value
-                                  ? const Size(139, 30.0)
-                                  : const Size(159, 30.0),
+                                  ? const Size(118, 30.0)
+                                  : const Size(130, 30.0),
                               waveformType: WaveformType.long,
                               playerController: playerController,
                             ).paddingOnly(
-                              left: homeController.isArabic.value ? 18 : 8,
+                              left: homeController.isArabic.value ? 4 : 8,
                             );
                           }
                         }),