diff --git a/public/css/custom.css b/public/css/custom.css
index d2778487d..87a6a7ad9 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -924,7 +924,7 @@ table .align-items-center td span.badge {
     margin-right: 15px;
 }
 
-#invoice-item-rows td {
+.table-padding-05 td {
     padding-top: 0.5rem;
     padding-bottom: 0.5rem;
 }
diff --git a/resources/assets/js/views/common/documents.js b/resources/assets/js/views/common/documents.js
index e791afd17..ff7d52fd3 100644
--- a/resources/assets/js/views/common/documents.js
+++ b/resources/assets/js/views/common/documents.js
@@ -280,7 +280,7 @@ const app = new Vue({
                 description: item.description,
                 quantity: 1,
                 price: item.price,
-                add_tax: (document.getElementById('line-discount') != null) ? false : true,
+                add_tax: (document.getElementById('invoice-item-discount-rows') != null) ? false : true,
                 tax_ids: item_taxes,
                 add_discount: false,
                 discount: 0,
diff --git a/resources/views/components/documents/form/items.blade.php b/resources/views/components/documents/form/items.blade.php
index 7b6b9cbb1..613ef66e5 100644
--- a/resources/views/components/documents/form/items.blade.php
+++ b/resources/views/components/documents/form/items.blade.php
@@ -68,12 +68,12 @@
                     </tr>
                 </thead>
 
-                <tbody id="invoice-item-rows">
+                <tbody id="{{ (!$hideDiscount && in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) ? 'invoice-item-discount-rows' : 'invoice-item-rows' }}" class="table-padding-05">
                     @include('components.documents.form.line-item')
 
                     @stack('add_item_td_start')
                         <tr id="addItem">
-                            <td class="text-right border-bottom-0 p-0" colspan="{{ (!$hideDiscount && in_array(setting('localisation.discount_location', 'total'), ['item', 'both'])) ? 8 : 7 }}" :colspan="colspan">
+                            <td class="text-right border-bottom-0 p-0" colspan="{{ 7 }}" :colspan="colspan">
                                 <x-select-item-button
                                     type="{{ $type }}"
                                     is-sale="{{ $isSalePrice }}"
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 7eeb02e79..1235081fb 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -108,8 +108,6 @@
                             @endif
                         @stack('price_td_end')
 
-
-
                         @stack('total_td_start')
                             @if (!$hideAmount)
                                 <td colspan="1" class="text-right long-texts pb-3 border-bottom-0">
@@ -136,7 +134,7 @@
                             @stack('item_custom_fields')
                         </td>
 
-                        <td class="border-top-0 p-0" colspan="{{ (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both'])) ? '5' : '4' }}">
+                        <td class="border-top-0 p-0" colspan="{{ '4' }}">
                             <table class="w-100">
                                 <colgroup>
                                     <col style="width: 100px;">
@@ -150,12 +148,12 @@
                                     <tr v-if="!row.add_tax || !row.add_discount">
                                         <td colspan="1" style="border: 0; max-width: 100px; border: 0px; padding-left: 10px;">
                                             <div style="max-width: 100px;">
-                                                <button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount">Add Discount</button>
+                                                <button type="button" class="btn btn-link btn-sm p-0" @click="onAddLineDiscount(index)" v-if="!row.add_discount">{{ trans('general.title.add', ['type' => trans('invoices.discount')]) }}</button>
                                             </div>
                                         </td>
                                         <td colspan="1" style="border: 0; max-width: 100px; border: 0px; padding-right: 10px; text-align: right;">
                                             <div style="max-width: 100px;">
-                                                <button type="button" class="btn btn-link btn-sm p-0" @click="onAddTax(index)" v-if="!row.add_tax">Add Tax</button>
+                                                <button type="button" class="btn btn-link btn-sm p-0" @click="onAddTax(index)" v-if="!row.add_tax">{{ trans('general.title.add', ['type' => trans_choice('general.taxes', 1)]) }}</button>
                                             </div>
                                         </td>
                                         <td colspan="1" style="border: 0;" class="text-right total-column border-bottom-0 long-texts">
@@ -165,31 +163,33 @@
                                     </tr>
 
                                     <tr v-if="row.add_discount">
-                                        <td colspan="2" class="pb-0" style="border: 0;  padding-right: 5px; padding-left: 5px;" >
-                                            <div style="margin-left: -30px; margin-right: 35px;">
-                                            <span style="float: left; margin-right: 10px; margin-top: 15px;">{{ trans_choice('general.discount', 1) }}</span>
+                                        <td colspan="2" class="pb-0" style="border: 0px; padding-left: 5px; padding-right: 5px;">
+                                            <div style="margin-left: -63px; margin-right: 35px;">
+                                            <span style="float: left; margin-right: 10px; margin-top: 15px;">{{ trans('invoices.discount') }}</span>
                                             @stack('discount_input_start')
-                                            <div class="input-group input-group-merge">
-                                                <div class="input-group-prepend">
-                                                    <span class="input-group-text" id="input-discount">
-                                                        <i class="fa fa-percent"></i>
-                                                    </span>
-                                                </div>
-                                                <input type="number"
-                                                    max="100"
-                                                    min="0"
-                                                    class="form-control text-center"
-                                                    :name="'items.' + index + '.discount'"
-                                                    autocomplete="off"
-                                                    required="required"
-                                                    data-item="discount"
-                                                    v-model="row.discount"
-                                                    @input="onCalculateTotal"
-                                                    @change="form.errors.clear('items.' + index + '.discount')">
+                                            <div class="form-group mb-0" style="display: inline-block; position: relative; width: 88%;">
+                                                <div class="input-group input-group-merge mb-0 select-tax">
+                                                    <div class="input-group-prepend">
+                                                        <span class="input-group-text" id="input-discount">
+                                                            <i class="fa fa-percent"></i>
+                                                        </span>
+                                                    </div>
+                                                    <input type="number"
+                                                        max="100"
+                                                        min="0"
+                                                        class="form-control text-center"
+                                                        :name="'items.' + index + '.discount'"
+                                                        autocomplete="off"
+                                                        required="required"
+                                                        data-item="discount"
+                                                        v-model="row.discount"
+                                                        @input="onCalculateTotal"
+                                                        @change="form.errors.clear('items.' + index + '.discount')">
 
-                                                <div class="invalid-feedback d-block"
-                                                    v-if="form.errors.has('items.' + index + '.discount')"
-                                                    v-html="form.errors.get('items.' + index + '.discount')">
+                                                    <div class="invalid-feedback d-block"
+                                                        v-if="form.errors.has('items.' + index + '.discount')"
+                                                        v-html="form.errors.get('items.' + index + '.discount')">
+                                                    </div>
                                                 </div>
                                             </div>
                                             @stack('discount_input_end')
@@ -213,7 +213,7 @@
                                     <tr v-for="(row_tax, row_tax_index) in row.tax_ids"
                                     :index="row_tax_index">
                                     @endif
-                                        <td colspan="2" class="pb-0" style="border: 0;  padding-right: 5px; padding-left: 5px;" >
+                                        <td colspan="2" class="pb-0" style="border: 0;  padding-right: 5px; padding-left: 5px;">
                                             <div style="margin-left: -30px; margin-right: 35px;">
                                             <span style="float: left; margin-right: 10px; margin-top: 15px;">{{ trans_choice('general.taxes', 1) }}</span>
 
@@ -304,8 +304,8 @@
                                         </td>
                                         <td colspan="1" style="border: 0;">
                                             @if (!$hideDiscount && in_array(setting('localisation.discount_location'), ['item', 'both']))
-                                                <i class="far fa-trash-alt"></i>
-                                                <button type="button" @click="onDeleteDiscount(index)" class="btn btn-link btn-delete p-0">
+                                                <button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete p-0">
+                                                    <i class="far fa-trash-alt"></i>
                                                 </button>
                                             @endif
                                         </td>
diff --git a/resources/views/components/documents/form/totals.blade.php b/resources/views/components/documents/form/totals.blade.php
index 58156ee12..78fe2071b 100644
--- a/resources/views/components/documents/form/totals.blade.php
+++ b/resources/views/components/documents/form/totals.blade.php
@@ -8,7 +8,7 @@
                     <col style="width: 20%;">
                     <col style="width: 40px;">
                 </colgroup>
-                <tbody id="invoice-item-rows">
+                <tbody id="invoice-total-rows" class="table-padding-05">
                     @stack('sub_total_td_start')
                     <tr id="tr-subtotal">
                         <td class="border-bottom-0 pb-0"></td>
@@ -26,7 +26,7 @@
 
                 @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
                     @stack('item_discount_td_start')
-                        <tr id="tr-subtotal">
+                        <tr id="tr-line-discount" v-if="totals.item_discount">
                             <td class="border-top-0 pt-0 pb-0"></td>
                             <td class="text-right border-top-0 border-right-0 border-bottom-0 align-middle pt-0 pb-0">
                                 <strong>{{ trans('invoices.item_discount') }}</strong>