diff --git a/.env.example b/.env.example
index 2a857245..330a9e3f 100644
--- a/.env.example
+++ b/.env.example
@@ -21,11 +21,11 @@ REDIS_PASSWORD=null
 REDIS_PORT=6379
 
 MAIL_DRIVER=smtp
-MAIL_HOST=mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
+MAIL_HOST=
+MAIL_PORT=
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=
 
 PUSHER_APP_ID=
 PUSHER_KEY=
diff --git a/public/assets/icon/file-alt-solid.svg b/public/assets/icon/file-alt-solid.svg
new file mode 100644
index 00000000..54514914
--- /dev/null
+++ b/public/assets/icon/file-alt-solid.svg
@@ -0,0 +1,13 @@
+<svg
+    aria-hidden="true"
+    focusable="false"
+    data-prefix="fas"
+    data-icon="file-alt"
+    class="svg-inline--fa fa-file-alt fa-w-12"
+    role="img" xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 384 512">
+    <path
+        fill="#55547A"
+        d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm64 236c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12v8zm0-64c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12v8zm0-72v8c0 6.6-5.4 12-12 12H108c-6.6 0-12-5.4-12-12v-8c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm96-114.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z">
+    </path>
+</svg>
diff --git a/resources/assets/js/views/dashboard/Dashboard.vue b/resources/assets/js/views/dashboard/Dashboard.vue
index fac1dfd0..24f1f261 100644
--- a/resources/assets/js/views/dashboard/Dashboard.vue
+++ b/resources/assets/js/views/dashboard/Dashboard.vue
@@ -168,12 +168,12 @@
           >
             <table-column :label="$t('dashboard.recent_invoices_card.due_on')" show="formattedDueDate" />
             <table-column :label="$t('dashboard.recent_invoices_card.customer')" show="user.name" />
-                 <table-column
+            <table-column
               :label="$t('invoices.status')"
               sort-as="status"
             >
               <template slot-scope="row" >
-                <span> {{ $t('invoices.status') }}</span> 
+                <span> {{ $t('invoices.status') }}</span>
                 <span :class="'inv-status-'+row.status.toLowerCase()">{{ (row.status != 'PARTIALLY_PAID')? row.status : row.status.replace('_', ' ') }}</span>
               </template>
             </table-column>
@@ -190,7 +190,7 @@
             >
               <template slot-scope="row">
                 <v-dropdown>
-                  <a slot="activator" href="#">
+                  <a slot="activator" href="#/">
                     <dot-icon />
                   </a>
                   <v-dropdown-item>
@@ -203,14 +203,14 @@
                       {{ $t('invoices.view') }}
                     </router-link>
                   </v-dropdown-item>
-                  <v-dropdown-item>
-                    <a class="dropdown-item" href="#" @click="sendInvoice(row.id)" >
+                  <v-dropdown-item v-if="row.status == 'DRAFT'">
+                    <a class="dropdown-item" href="#/" @click="sendInvoice(row.id)" >
                       <font-awesome-icon icon="envelope" class="dropdown-item-icon" />
                       {{ $t('invoices.send_invoice') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status === 'DRAFT'">
-                    <a class="dropdown-item" href="#" @click="sentInvoice(row.id)">
+                    <a class="dropdown-item" href="#/" @click="sentInvoice(row.id)">
                       <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                       {{ $t('invoices.mark_as_sent') }}
                     </a>
@@ -272,7 +272,7 @@
             >
               <template slot-scope="row">
                 <v-dropdown>
-                  <a slot="activator" href="#">
+                  <a slot="activator" href="#/">
                     <dot-icon />
                   </a>
                   <v-dropdown-item>
@@ -294,35 +294,35 @@
                     </router-link>
                   </v-dropdown-item>
                   <v-dropdown-item>
-                    <a class="dropdown-item" href="#" @click="convertInToinvoice(row.id)">
-                      <font-awesome-icon icon="envelope" class="dropdown-item-icon" />
+                    <a class="dropdown-item" href="#/" @click="convertInToinvoice(row.id)">
+                      <font-awesome-icon icon="file-alt" class="dropdown-item-icon" />
                       {{ $t('estimates.convert_to_invoice') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status === 'DRAFT'">
-                    <a class="dropdown-item" href="#" @click.self="onMarkAsSent(row.id)">
+                    <a class="dropdown-item" href="#/" @click.self="onMarkAsSent(row.id)">
                       <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                       {{ $t('estimates.mark_as_sent') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status !== 'SENT'">
-                    <a class="dropdown-item" href="#" @click.self="sendEstimate(row.id)">
+                    <a class="dropdown-item" href="#/" @click.self="sendEstimate(row.id)">
                       <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
                       {{ $t('estimates.send_estimate') }}
                     </a>
                   </v-dropdown-item>
                   <v-dropdown-item v-if="row.status !== 'ACCEPTED'">
-                    <a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
+                    <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 !== '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') }}
-                </a>
-              </v-dropdown-item>
+                  <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') }}
+                    </a>
+                  </v-dropdown-item>
                 </v-dropdown>
               </template>
             </table-column>
@@ -459,7 +459,7 @@ export default {
       swal({
         title: this.$t('general.are_you_sure'),
         text: this.$t('estimates.confirm_conversion'),
-        icon: '/assets/icon/envelope-solid.svg',
+        icon: '/assets/icon/file-alt-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willDelete) => {
@@ -603,7 +603,7 @@ export default {
         }
       })
     },
-    
+
     async sendEstimate (id) {
       swal({
         title: this.$t('general.are_you_sure'),
diff --git a/resources/assets/js/views/estimates/Index.vue b/resources/assets/js/views/estimates/Index.vue
index 736a89a3..9b826daa 100644
--- a/resources/assets/js/views/estimates/Index.vue
+++ b/resources/assets/js/views/estimates/Index.vue
@@ -245,31 +245,31 @@
                 </router-link>
               </v-dropdown-item>
               <v-dropdown-item>
-                <a class="dropdown-item" href="#" @click="convertInToinvoice(row.id)">
-                  <font-awesome-icon icon="envelope" class="dropdown-item-icon" />
+                <a class="dropdown-item" href="#/" @click="convertInToinvoice(row.id)">
+                  <font-awesome-icon icon="file-alt" class="dropdown-item-icon" />
                   {{ $t('estimates.convert_to_invoice') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status !== 'SENT'">
-                <a class="dropdown-item" href="#" @click.self="onMarkAsSent(row.id)">
+                <a class="dropdown-item" href="#/" @click.self="onMarkAsSent(row.id)">
                   <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                   {{ $t('estimates.mark_as_sent') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status !== 'SENT'">
-                <a class="dropdown-item" href="#" @click.self="sendEstimate(row.id)">
+                <a class="dropdown-item" href="#/" @click.self="sendEstimate(row.id)">
                   <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
                   {{ $t('estimates.send_estimate') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status !== 'ACCEPTED'">
-                <a class="dropdown-item" href="#" @click.self="onMarkAsAccepted(row.id)">
+                <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 !== 'REJECTED'">
-                <a class="dropdown-item" href="#" @click.self="onMarkAsRejected(row.id)">
+                <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') }}
                 </a>
@@ -424,7 +424,7 @@ export default {
           let response = await this.markAsAccepted(data)
           this.refreshTable()
           if (response.data) {
-            this.filters.status = 'ACCEPTED'
+            this.filters.status = ''
             this.$refs.table.refresh()
             window.toastr['success'](this.$tc('estimates.marked_as_accepted_message'))
           }
@@ -446,7 +446,7 @@ export default {
           let response = await this.markAsRejected(data)
           this.refreshTable()
           if (response.data) {
-            this.filters.status = 'REJECTED'
+            this.filters.status = ''
             this.$refs.table.refresh()
             window.toastr['success'](this.$tc('estimates.marked_as_rejected_message'))
           }
@@ -512,7 +512,7 @@ export default {
       swal({
         title: this.$t('general.are_you_sure'),
         text: this.$t('estimates.confirm_conversion'),
-        icon: '/assets/icon/envelope-solid.svg',
+        icon: '/assets/icon/file-alt-solid.svg',
         buttons: true,
         dangerMode: true
       }).then(async (willConvertInToinvoice) => {
diff --git a/resources/assets/js/views/invoices/Index.vue b/resources/assets/js/views/invoices/Index.vue
index 461f4deb..51db97bf 100644
--- a/resources/assets/js/views/invoices/Index.vue
+++ b/resources/assets/js/views/invoices/Index.vue
@@ -248,13 +248,13 @@
                 </router-link>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status == 'DRAFT'">
-                <a class="dropdown-item" href="#" @click="sendInvoice(row.id)" >
+                <a class="dropdown-item" href="#/" @click="sendInvoice(row.id)" >
                   <font-awesome-icon icon="paper-plane" class="dropdown-item-icon" />
                   {{ $t('invoices.send_invoice') }}
                 </a>
               </v-dropdown-item>
               <v-dropdown-item v-if="row.status == 'DRAFT'">
-                <a class="dropdown-item" href="#" @click="markInvoiceAsSent(row.id)">
+                <a class="dropdown-item" href="#/" @click="markInvoiceAsSent(row.id)">
                   <font-awesome-icon icon="check-circle" class="dropdown-item-icon" />
                   {{ $t('invoices.mark_as_sent') }}
                 </a>
diff --git a/resources/assets/js/views/payments/Create.vue b/resources/assets/js/views/payments/Create.vue
index 4d61b776..1a0bea01 100644
--- a/resources/assets/js/views/payments/Create.vue
+++ b/resources/assets/js/views/payments/Create.vue
@@ -166,7 +166,7 @@ export default {
         user_id: null,
         payment_number: null,
         payment_date: null,
-        amount: 100,
+        amount: 0,
         payment_mode: null,
         invoice_id: null,
         notes: null
diff --git a/resources/assets/js/views/settings/MailConfig.vue b/resources/assets/js/views/settings/MailConfig.vue
index afbf481b..86a92fa9 100644
--- a/resources/assets/js/views/settings/MailConfig.vue
+++ b/resources/assets/js/views/settings/MailConfig.vue
@@ -142,7 +142,7 @@ export default {
   data () {
     return {
       mailConfigData: {
-        mail_driver: '',
+        mail_driver: 'smtp',
         mail_host: '',
         mail_port: null,
         mail_username: '',
diff --git a/resources/assets/js/views/wizard/EmailConfiguration.vue b/resources/assets/js/views/wizard/EmailConfiguration.vue
index ecc92ad5..49be7e7e 100644
--- a/resources/assets/js/views/wizard/EmailConfiguration.vue
+++ b/resources/assets/js/views/wizard/EmailConfiguration.vue
@@ -148,7 +148,7 @@ export default {
     return {
       mailConfigData: {
         mail_driver: 'smtp',
-        mail_host: 'mailtrap.io',
+        mail_host: '',
         mail_port: null,
         mail_username: null,
         mail_password: null,