diff --git a/public/css/app.css b/public/css/app.css
index 9832fdae6..0658b2841 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -47211,6 +47211,16 @@ html[dir='rtl'] .el-scrollbar__wrap {
   opacity: 0.5;
 }
 
+/* template table border radius control */
+html[dir="rtl"] .lines-radius-border thead td:first-child {
+    border-radius: 0px 10px 10px 0px;
+}
+
+html[dir="rtl"] .lines-radius-border thead td:last-child {
+    border-radius: 10px 0px 0px 10px;
+}
+/* template table border radius control */
+
 [dir="ltr"] .ltr\:-right-57 {
     right: -14.5rem;
 }
@@ -47934,6 +47944,22 @@ body{
   margin-left: calc(0.5rem * calc(1 - var(--tw-space-x-reverse)));
 }
 
+[dir="ltr"] .ltr\:rounded-tl-lg{
+  border-top-left-radius: 0.5rem;
+}
+
+[dir="ltr"] .ltr\:rounded-bl-lg{
+  border-bottom-left-radius: 0.5rem;
+}
+
+[dir="ltr"] .ltr\:rounded-tr-lg{
+  border-top-right-radius: 0.5rem;
+}
+
+[dir="ltr"] .ltr\:rounded-br-lg{
+  border-bottom-right-radius: 0.5rem;
+}
+
 [dir="ltr"] .ltr\:pr-6{
   padding-right: 1.5rem;
 }
@@ -48109,6 +48135,22 @@ body{
   --tw-space-x-reverse: 1;
 }
 
+[dir="rtl"] .rtl\:rounded-tr-lg{
+  border-top-right-radius: 0.5rem;
+}
+
+[dir="rtl"] .rtl\:rounded-br-lg{
+  border-bottom-right-radius: 0.5rem;
+}
+
+[dir="rtl"] .rtl\:rounded-tl-lg{
+  border-top-left-radius: 0.5rem;
+}
+
+[dir="rtl"] .rtl\:rounded-bl-lg{
+  border-bottom-left-radius: 0.5rem;
+}
+
 [dir="rtl"] .rtl\:pl-6{
   padding-left: 1.5rem;
 }
diff --git a/public/css/print.css b/public/css/print.css
index 738af5d3e..4497ec86b 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -242,7 +242,7 @@ html[dir='rtl'] .print-template .ml-2
     border-radius: 0.25rem
 }
 
-html[dir='ltr'] .border-radius-first {
+/* html[dir='ltr'] .border-radius-first {
     border-radius: 10px 0px 0px 10px;
 }
 
@@ -256,8 +256,18 @@ html[dir='ltr'] .border-radius-last {
 
 html[dir='rtl'] .border-radius-last {
     border-radius: 10px 0px 0px 10px;
+} */
+
+/* template table border radius control */
+html[dir="ltr"] .lines-radius-border thead td:first-child {
+    border-radius: 10px 0px 0px 10px;
 }
 
+html[dir="ltr"] .lines-radius-border thead td:last-child {
+    border-radius: 0px 10px 10px 0px;
+}
+/* template table border radius control */
+
 html[dir='ltr'] .float-left
 {
     float: left !important;
diff --git a/resources/assets/sass/app.css b/resources/assets/sass/app.css
index 2e5d15b39..f7bccae24 100644
--- a/resources/assets/sass/app.css
+++ b/resources/assets/sass/app.css
@@ -503,6 +503,16 @@ html[dir='rtl'] .el-scrollbar__wrap {
     @apply cursor-default pointer-events-none opacity-50;
 }
 
+/* template table border radius control */
+html[dir="rtl"] .lines-radius-border thead td:first-child {
+    border-radius: 0px 10px 10px 0px;
+}
+
+html[dir="rtl"] .lines-radius-border thead td:last-child {
+    border-radius: 10px 0px 0px 10px;
+}
+/* template table border radius control */
+
 [dir="ltr"] .ltr\:-right-57 {
     right: -14.5rem;
 }
diff --git a/resources/views/components/documents/template/default.blade.php b/resources/views/components/documents/template/default.blade.php
index 023e80b44..705645817 100644
--- a/resources/views/components/documents/template/default.blade.php
+++ b/resources/views/components/documents/template/default.blade.php
@@ -195,12 +195,12 @@
         <div class="row">
             <div class="col-100">
                 <div class="text extra-spacing">
-                    <table class="lines">
+                    <table class="lines lines-radius-border">
                         <thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                             <tr>
                                 @stack('name_th_start')
                                     @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                        <td class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
+                                        <td class="item text font-semibold text-alignment-left text-left text-white">
                                             <span>
                                                 {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
                                             </span>
@@ -242,7 +242,7 @@
 
                                 @stack('total_th_start')
                                     @if (! $hideAmount)
-                                        <td class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
+                                        <td class="total text font-semibold text-white text-alignment-right text-right">
                                             <span>
                                                 {{ trans($textAmount) }}
                                             </span>
diff --git a/resources/views/components/documents/template/modern.blade.php b/resources/views/components/documents/template/modern.blade.php
index ee83c890b..7345a4fe2 100644
--- a/resources/views/components/documents/template/modern.blade.php
+++ b/resources/views/components/documents/template/modern.blade.php
@@ -206,12 +206,12 @@
         <div class="row">
             <div class="col-100">
                 <div class="text extra-spacing">
-                    <table class="lines modern-lines">
+                    <table class="lines modern-lines lines-radius-border">
                         <thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
                             <tr>
                                 @stack('name_th_start')
                                     @if (! $hideItems || (! $hideName && ! $hideDescription))
-                                        <td class="item text font-semibold text-alignment-left text-left text-white border-radius-first">
+                                        <td class="item text font-semibold text-alignment-left text-left text-white">
                                             {{ (trans_choice($textItems, 2) != $textItems) ? trans_choice($textItems, 2) : trans($textItems) }}
                                         </td>
                                     @endif
@@ -245,7 +245,7 @@
 
                                 @stack('total_th_start')
                                     @if (! $hideAmount)
-                                        <td class="total text font-semibold text-white text-alignment-right text-right border-radius-last">
+                                        <td class="total text font-semibold text-white text-alignment-right text-right">
                                             {{ trans($textAmount) }}
                                         </td>
                                     @endif
diff --git a/resources/views/components/form/group/toggle.blade.php b/resources/views/components/form/group/toggle.blade.php
index 1bd1459b2..ee43b789c 100644
--- a/resources/views/components/form/group/toggle.blade.php
+++ b/resources/views/components/form/group/toggle.blade.php
@@ -11,24 +11,24 @@
 
         <div class="flex items-center mt-1">
             @if (empty($attributes['disabled']))
-                <label class="relative w-10 rounded-tl-lg rounded-bl-lg py-2 px-1 text-sm text-center transition-all cursor-pointer" @click="form.{{ $name }}=1" v-bind:class="[form.{{ $name }} == 1 ? ['bg-green-500','text-white'] : 'bg-black-100']">
+                <label class="relative w-10 ltr:rounded-tl-lg ltr:rounded-bl-lg rtl:rounded-tr-lg rtl:rounded-br-lg py-2 px-1 text-sm text-center transition-all cursor-pointer" @click="form.{{ $name }}=1" v-bind:class="[form.{{ $name }} == 1 ? ['bg-green-500','text-white'] : 'bg-black-100']">
                     {{ empty($enable) ? trans('general.yes') : $enable }}
                     <input type="radio" name="{{ $name }}" id="{{ $name }}-1" class="absolute left-0 opacity-0">
                 </label>
             @else
-                <label class="relative w-10 rounded-tl-lg rounded-bl-lg py-2 px-1 text-sm text-center transition-all cursor-not-allowed{{ ($value) ? ' bg-green-500 text-white opacity-20 disabled' : ' disabled' }}">
+                <label class="relative w-10 ltr:rounded-tl-lg ltr:rounded-bl-lg rtl:rounded-tr-lg rtl:rounded-br-lg py-2 px-1 text-sm text-center transition-all cursor-not-allowed{{ ($value) ? ' bg-green-500 text-white opacity-20 disabled' : ' disabled' }}">
                     {{ empty($enable) ? trans('general.yes') : $enable }}
                     <input type="radio" name="{{ $name }}" id="{{ $name }}-1" class="absolute left-0 opacity-0" disabled>
                 </label>
             @endif
 
             @if (empty($attributes['disabled']))
-                <label class="relative w-10 rounded-tr-lg rounded-br-lg py-2 px-1 text-sm text-center transition-all cursor-pointer" @click="form.{{ $name }}=0" v-bind:class="[form.{{ $name }} == 0 ? ['bg-red-500','text-white'] : 'bg-black-100']">
+                <label class="relative w-10 ltr:rounded-tr-lg ltr:rounded-br-lg rtl:rounded-tl-lg rtl:rounded-bl-lg py-2 px-1 text-sm text-center transition-all cursor-pointer" @click="form.{{ $name }}=0" v-bind:class="[form.{{ $name }} == 0 ? ['bg-red-500','text-white'] : 'bg-black-100']">
                     {{ empty($disable) ? trans('general.no') : $disable }}
                     <input type="radio" name="{{ $name }}" id="{{ $name }}-0" class="absolute left-0 opacity-0">
                 </label>
             @else
-                <label class="relative w-10 rounded-tr-lg rounded-br-lg py-2 px-1 text-sm text-center transition-all cursor-not-allowed{{ ($value) ? ' disabled' : 'bg-red-500 text-white opacity-20 disabled disabled' }}">
+                <label class="relative w-10 ltr:rounded-tr-lg ltr:rounded-br-lg rtl:rounded-tl-lg rtl:rounded-bl-lg py-2 px-1 text-sm text-center transition-all cursor-not-allowed{{ ($value) ? ' disabled' : 'bg-red-500 text-white opacity-20 disabled disabled' }}">
                     {{ empty($disable) ? trans('general.no') : $disable }}
                     <input type="radio" name="{{ $name }}" id="{{ $name }}-0" class="absolute left-0 opacity-0" disabled>
                 </label>