diff --git a/resources/assets/js/plugins/fr.js b/resources/assets/js/plugins/fr.js
index 280b51bd..27d9c312 100644
--- a/resources/assets/js/plugins/fr.js
+++ b/resources/assets/js/plugins/fr.js
@@ -554,7 +554,17 @@ export default {
       right: 'Droite',
       left: 'La gauche',
       action: 'action',
-      add_currency: 'Ajouter une devise',
+      add_currency: 'Ajouter une devise'
+    },
+    mail: {
+      host: 'Mail Host',
+      port: 'Port mail',
+      driver: 'Pilote de courrier',
+      password: 'Mot de passe mail',
+      username: "Mail Nom d'utilisateur",
+      mail_config: 'Configuration du courrier',
+      encryption: 'Chiffrement du courrier',
+      mail_config_desc: "Les détails ci-dessous seront utilisés pour mettre à jour l'environnement de messagerie. Aussi, vous pouvez modifier les détails à tout moment après la connexion."
     },
     pdf: {
       title: 'Paramètre PDF',
diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue
index c52c9fea..29cb5574 100644
--- a/resources/assets/js/views/estimates/Index.vue
+++ b/resources/assets/js/views/estimates/Index.vue
@@ -261,13 +261,13 @@
                   {{ $t('estimates.send_estimate') }}
                 </a>
               </v-dropdown-item>
-              <v-dropdown-item v-if="row.status === 'DRAFT' || row.status === 'REJECTED'">
+              <v-dropdown-item v-if="row.status !== 'ACCEPTED'">
                 <a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
                   <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_accepted') }}
                 </a>
               </v-dropdown-item>
-              <v-dropdown-item v-if="row.status === 'ACCEPTED' || row.status === 'DRAFT'">
+              <v-dropdown-item v-if="row.status !== 'REJECTED'">
                 <a class="dropdown-item" href="#" @click.self="onMarkAsRejected(row.id)">
                   <font-awesome-icon icon="times-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_rejected') }}
@@ -514,8 +514,8 @@ export default {
         icon: '/assets/icon/envelope-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (willDelete) => {
-        if (willDelete) {
+      }).then(async (willConvertInToinvoice) => {
+        if (willConvertInToinvoice) {
           let res = await this.convertToInvoice(id)
           if (res.data) {
             window.toastr['success'](this.$t('estimates.conversion_message'))
@@ -562,8 +562,8 @@ export default {
         icon: '/assets/icon/check-circle-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (willDelete) => {
-        if (willDelete) {
+      }).then(async (willMarkAsSent) => {
+        if (willMarkAsSent) {
           const data = {
             id: id
           }
@@ -582,8 +582,8 @@ export default {
         icon: '/assets/icon/paper-plane-solid.svg',
         buttons: true,
         dangerMode: true
-      }).then(async (sendEstimate) => {
-        if (sendEstimate) {
+      }).then(async (willSendEstimate) => {
+        if (willSendEstimate) {
           const data = {
             id: id
           }
diff --git a/resources/assets/js/views/estimates/View.vue b/resources/assets/js/views/estimates/View.vue
index d02a346a..69f7817e 100644
--- a/resources/assets/js/views/estimates/View.vue
+++ b/resources/assets/js/views/estimates/View.vue
@@ -222,12 +222,22 @@ export default {
       return true
     },
     async onMarkAsSent () {
-      this.isRequestOnGoing = true
-      let response = await this.markAsSent({id: this.estimate.id})
-      this.isRequestOnGoing = false
-      if (response.data) {
-        window.toastr['success'](this.$tc('estimates.mark_as_sent'))
-      }
+      swal({
+        title: this.$t('general.are_you_sure'),
+        text: this.$t('estimates.confirm_mark_as_sent'),
+        icon: '/assets/icon/check-circle-solid.svg',
+        buttons: true,
+        dangerMode: true
+      }).then(async (willMarkAsSent) => {
+        if (willMarkAsSent) {
+          this.isRequestOnGoing = true
+          let response = await this.markAsSent({id: this.estimate.id})
+          this.isRequestOnGoing = false
+          if (response.data) {
+            window.toastr['success'](this.$tc('estimates.mark_as_sent'))
+          }
+        }
+      })
     },
     async removeEstimate (id) {
       this.selectEstimate([parseInt(id)])
@@ -235,7 +245,7 @@ export default {
       swal({
         title: 'Deleted',
         text: 'you will not be able to recover this estimate!',
-        icon: 'error',
+        icon: '/assets/icon/trash-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
diff --git a/resources/assets/js/views/invoices/View.vue b/resources/assets/js/views/invoices/View.vue
index fd1ce809..f79052ef 100644
--- a/resources/assets/js/views/invoices/View.vue
+++ b/resources/assets/js/views/invoices/View.vue
@@ -252,7 +252,7 @@ export default {
       swal({
         title: 'Deleted',
         text: 'you will not be able to recover this invoice!',
-        icon: 'error',
+        icon: '/assets/icon/trash-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
diff --git a/resources/assets/js/views/settings/TaxTypes.vue b/resources/assets/js/views/settings/TaxTypes.vue
index 338b9b51..52eb5c48 100644
--- a/resources/assets/js/views/settings/TaxTypes.vue
+++ b/resources/assets/js/views/settings/TaxTypes.vue
@@ -29,16 +29,9 @@
       >
         <table-column
           :sortable="true"
-          :filterable="true"
           :label="$t('settings.tax_types.tax_name')"
-        >
-          <template slot-scope="row">
-            <span>{{ $t('settings.tax_types.tax_name') }}</span>
-            <span class="tax-name mt-3">
-              {{ row.name }}
-            </span>
-          </template>
-        </table-column>
+          show="name"
+        />
         <table-column
           :sortable="true"
           :filterable="true"