diff --git a/lang/en.json b/lang/en.json
index 24e72e11..0c601b32 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1355,6 +1355,10 @@
     "next": "Next",
     "continue": "Continue",
     "skip": "Skip",
+    "install_language": {
+      "title": "Choose your language",
+      "description": "Select language wizard to install InvoiceShelf"
+    },
     "database": {
       "database": "Site URL & Database",
       "connection": "Database Connection",
@@ -1366,6 +1370,7 @@
       "username": "Database Username",
       "db_name": "Database Name",
       "db_path": "Database Path",
+      "overwrite": "Overwrite existing database and proceed",
       "desc": "Create a database on your server and set the credentials using the form below."
     },
     "permissions": {
diff --git a/lang/es.json b/lang/es.json
index 4b5d2ee7..077a6500 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -1355,6 +1355,10 @@
     "next": "Siguiente",
     "continue": "Continuar",
     "skip": "Saltar",
+    "install_language": {
+      "title": "Elige tu idioma",
+      "description": "Selecciona el asistente de idioma para instalar InvoiceShelf"
+    },
     "database": {
       "database": "URL del sitio y base de datos",
       "connection": "Conexión de base de datos",
diff --git a/package.json b/package.json
index a06915b3..30875827 100644
--- a/package.json
+++ b/package.json
@@ -32,9 +32,9 @@
     "@stripe/stripe-js": "^2.4.0",
     "@tiptap/core": "^2.1.16",
     "@tiptap/extension-text-align": "^2.1.16",
+    "@tiptap/pm": "^2.0.0",
     "@tiptap/starter-kit": "^2.1.16",
     "@tiptap/vue-3": "^2.1.16",
-    "@tiptap/pm": "^2.0.0",
     "@types/node": "^20.11.9",
     "@vuelidate/components": "^1.2.6",
     "@vuelidate/core": "^2.0.3",
diff --git a/resources/scripts/admin/components/currency-exchange-rate/ExchangeRateBulkUpdate.vue b/resources/scripts/admin/components/currency-exchange-rate/ExchangeRateBulkUpdate.vue
index b30fa82c..2f058ccc 100644
--- a/resources/scripts/admin/components/currency-exchange-rate/ExchangeRateBulkUpdate.vue
+++ b/resources/scripts/admin/components/currency-exchange-rate/ExchangeRateBulkUpdate.vue
@@ -74,7 +74,7 @@ import { useExchangeRateStore } from '@/scripts/admin/stores/exchange-rate'
 import { useCompanyStore } from '@/scripts/admin/stores/company'
 import { useRoute } from 'vue-router'
 import { useNotificationStore } from '@/scripts/stores/notification'
-import { computed, ref } from '@vue/runtime-core'
+import { computed, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import useVuelidate from '@vuelidate/core'
 import { required, helpers, numeric, decimal } from '@vuelidate/validators'
diff --git a/resources/scripts/admin/views/installation/Step1RequirementsCheck.vue b/resources/scripts/admin/views/installation/Step1RequirementsCheck.vue
index 7f8f644a..9756ed29 100644
--- a/resources/scripts/admin/views/installation/Step1RequirementsCheck.vue
+++ b/resources/scripts/admin/views/installation/Step1RequirementsCheck.vue
@@ -71,7 +71,7 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue'
+import { ref, computed, onMounted } from 'vue'
 import { useInstallationStore } from '@/scripts/admin/stores/installation.js'
 
 const emit = defineEmits(['next'])
@@ -83,6 +83,10 @@ const isShow = ref(true)
 
 const installationStore = useInstallationStore()
 
+onMounted(async () => {
+  getRequirements()
+})
+
 const hasNext = computed(() => {
   if (requirements.value) {
     let isRequired = true
diff --git a/resources/scripts/admin/views/installation/Step6AccountSettings.vue b/resources/scripts/admin/views/installation/Step6AccountSettings.vue
index 25ca65bf..aa217c5b 100644
--- a/resources/scripts/admin/views/installation/Step6AccountSettings.vue
+++ b/resources/scripts/admin/views/installation/Step6AccountSettings.vue
@@ -68,13 +68,15 @@
             @input="v$.userForm.password.$touch()"
           >
             <template #right>
-              <EyeOffIcon
+              <BaseIcon
                 v-if="isShowPassword"
+                name="EyeOffIcon"
                 class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
                 @click="isShowPassword = !isShowPassword"
               />
-              <EyeIcon
+              <BaseIcon
                 v-else
+                name="EyeIcon"
                 class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
                 @click="isShowPassword = !isShowPassword"
               />
diff --git a/resources/scripts/admin/views/installation/Step7CompanyInfo.vue b/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
index 73880722..6ba35306 100644
--- a/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
+++ b/resources/scripts/admin/views/installation/Step7CompanyInfo.vue
@@ -142,7 +142,6 @@
 
         <BaseInputGroup
           :label="$t('settings.company_info.vat_id')"
-          class="mt-4"
         >
           <BaseInput
             v-model.trim="companyForm.vat_id"
diff --git a/resources/scripts/customer/views/auth/ResetPassword.vue b/resources/scripts/customer/views/auth/ResetPassword.vue
index 9a0d9b84..682a91ad 100644
--- a/resources/scripts/customer/views/auth/ResetPassword.vue
+++ b/resources/scripts/customer/views/auth/ResetPassword.vue
@@ -29,13 +29,15 @@
         @input="v$.password.$touch()"
       >
         <template #right>
-          <EyeOffIcon
+          <BaseIcon
             v-if="isShowPassword"
+            name="EyeOffIcon"
             class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
             @click="isShowPassword = !isShowPassword"
           />
-          <EyeIcon
+          <BaseIcon
             v-else
+            name="EyeIcon"
             class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
             @click="isShowPassword = !isShowPassword"
           /> </template