diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 8cd326857..dd520c6db 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -97,7 +97,7 @@
                                                     <div class="card d-none" :class="[{'show' : discount}]">
                                                         <div class="discount card-body">
                                                             <div class="row align-items-center">
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="input-group input-group-merge">
                                                                         <div class="input-group-prepend">
                                                                             <span class="input-group-text" id="input-discount">
@@ -107,7 +107,7 @@
                                                                         {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="discount-description">
                                                                         <strong>{{ trans('invoices.discount_desc') }}</strong>
                                                                     </div>
@@ -115,13 +115,12 @@
                                                             </div>
                                                         </div>
                                                         <div class="discount card-footer">
-                                                            <div class="row text-center">
-                                                                <div class="col-md-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
-                                                                        <span class="btn-inner--icon"><i class="fas fa-times"></i></span>
-                                                                        <span class="btn-inner--text">{{ trans('general.cancel') }}</span>
+                                                            <div class="row float-right">
+                                                                <div class="col-xs-12 col-sm-12">
+                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                        {{ trans('general.cancel') }}
                                                                     </a>
-                                                                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
+                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
                                                                 </div>
                                                             </div>
                                                         </div>
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 1c7df6730..94c11fea8 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -98,7 +98,7 @@
                                                     <div class="card d-none" :class="[{'show' : discount}]">
                                                         <div class="discount card-body">
                                                             <div class="row align-items-center">
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="input-group input-group-merge">
                                                                         <div class="input-group-prepend">
                                                                             <span class="input-group-text" id="input-discount">
@@ -108,7 +108,7 @@
                                                                         {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="discount-description">
                                                                         <strong>{{ trans('invoices.discount_desc') }}</strong>
                                                                     </div>
@@ -116,13 +116,12 @@
                                                             </div>
                                                         </div>
                                                         <div class="discount card-footer">
-                                                            <div class="row text-center">
-                                                                <div class="col-md-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
-                                                                        <span class="btn-inner--icon"><i class="fas fa-times"></i></span>
-                                                                        <span class="btn-inner--text">{{ trans('general.cancel') }}</span>
+                                                            <div class="row float-right">
+                                                                <div class="col-xs-12 col-sm-12">
+                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                        {{ trans('general.cancel') }}
                                                                     </a>
-                                                                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
+                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
                                                                 </div>
                                                             </div>
                                                         </div>
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index 42e3e711e..f413e02d7 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -97,7 +97,7 @@
                                                     <div class="card d-none" :class="[{'show' : discount}]">
                                                         <div class="discount card-body">
                                                             <div class="row align-items-center">
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="input-group input-group-merge">
                                                                         <div class="input-group-prepend">
                                                                             <span class="input-group-text" id="input-discount">
@@ -107,7 +107,7 @@
                                                                         {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="discount-description">
                                                                         <strong>{{ trans('invoices.discount_desc') }}</strong>
                                                                     </div>
@@ -115,13 +115,12 @@
                                                             </div>
                                                         </div>
                                                         <div class="discount card-footer">
-                                                            <div class="row text-center">
-                                                                <div class="col-md-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
-                                                                        <span class="btn-inner--icon"><i class="fas fa-times"></i></span>
-                                                                        <span class="btn-inner--text">{{ trans('general.cancel') }}</span>
+                                                            <div class="row float-right">
+                                                                <div class="col-xs-12 col-sm-12">
+                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                        {{ trans('general.cancel') }}
                                                                     </a>
-                                                                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
+                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
                                                                 </div>
                                                             </div>
                                                         </div>
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 30c4f8aa2..1020b7baf 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -98,7 +98,7 @@
                                                     <div class="card d-none" :class="[{'show' : discount}]">
                                                         <div class="discount card-body">
                                                             <div class="row align-items-center">
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="input-group input-group-merge">
                                                                         <div class="input-group-prepend">
                                                                             <span class="input-group-text" id="input-discount">
@@ -108,7 +108,7 @@
                                                                         {!! Form::number('pre_discount', null, ['id' => 'pre-discount', 'class' => 'form-control']) !!}
                                                                     </div>
                                                                 </div>
-                                                                <div class="col-md-6">
+                                                                <div class="col-sm-6">
                                                                     <div class="discount-description">
                                                                         <strong>{{ trans('invoices.discount_desc') }}</strong>
                                                                     </div>
@@ -116,13 +116,12 @@
                                                             </div>
                                                         </div>
                                                         <div class="discount card-footer">
-                                                            <div class="row text-center">
-                                                                <div class="col-md-12">
-                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-icon btn-outline-secondary">
-                                                                        <span class="btn-inner--icon"><i class="fas fa-times"></i></span>
-                                                                        <span class="btn-inner--text">{{ trans('general.cancel') }}</span>
+                                                            <div class="row float-right">
+                                                                <div class="col-xs-12 col-sm-12">
+                                                                    <a href="javascript:void(0)" @click="discount = false" class="btn btn-outline-secondary header-button-top" @click="closePayment">
+                                                                        {{ trans('general.cancel') }}
                                                                     </a>
-                                                                    {!! Form::button('<span class="fa fa-save"></span> &nbsp;' . trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success']) !!}
+                                                                    {!! Form::button(trans('general.save'), ['type' => 'button', 'id' => 'save-discount', '@click' => 'onAddDiscount', 'class' => 'btn btn-success header-button-top']) !!}
                                                                 </div>
                                                             </div>
                                                         </div>