diff --git a/resources/assets/js/components/AkauntingMoney.vue b/resources/assets/js/components/AkauntingMoney.vue
index 361e0d144..2b8f906a9 100644
--- a/resources/assets/js/components/AkauntingMoney.vue
+++ b/resources/assets/js/components/AkauntingMoney.vue
@@ -1,5 +1,5 @@
 <template>
-    <div v-if="! rowInput" class="form-group"
+    <div v-if="! rowInput"
         :class="[{'has-error': error}, {'required': required}, {'readonly': readonly}, {'disabled': disabled}, col]">
         <label v-if="title" :for="name" class="form-control-label">{{ title }}</label>
 
@@ -20,7 +20,7 @@
         :class="[{'has-error': error}, {'required': required}, {'readonly': readonly}, {'disabled': disabled}, col]">
         <label v-if="title" :for="name" class="form-control-label">{{ title }}</label>
 
-        <div v-if="icon" class="input-group input-group-merge" :class="group_class">
+        <div v-if="icon" :class="group_class">
             <div v-if="icon" class="input-group-prepend">
                 <span class="input-group-text">
                     <i :class="'fa fa-' + icon"></i>
diff --git a/resources/assets/js/components/AkauntingRadioGroup.vue b/resources/assets/js/components/AkauntingRadioGroup.vue
index 5e3de39d0..9236e2387 100644
--- a/resources/assets/js/components/AkauntingRadioGroup.vue
+++ b/resources/assets/js/components/AkauntingRadioGroup.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="form-group" :class="col">
+    <div :class="col">
         <label :for="name" class="form-control-label">{{ text }}</label>
 
         <div class="tab-pane tab-example-result fade show active" role="tabpanel" aria-labelledby="-component-tab">
diff --git a/resources/assets/js/components/AkauntingWidget.vue b/resources/assets/js/components/AkauntingWidget.vue
index 89e7680bb..832a4e31f 100644
--- a/resources/assets/js/components/AkauntingWidget.vue
+++ b/resources/assets/js/components/AkauntingWidget.vue
@@ -7,7 +7,7 @@
         <template #modal-body>
             <div class="py-1 px-5 bg-body">
                 <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-                    <div class="form-group sm:col-span-3">
+                    <div class="sm:col-span-3">
                         <base-input
                             required
                             class="required"
@@ -20,7 +20,7 @@
                         </base-input>
                     </div>
 
-                    <div class="form-group sm:col-span-3">
+                    <div class="sm:col-span-3">
                         <base-input
                             required
                             class="required"
@@ -40,7 +40,7 @@
                         </base-input>
                     </div>
 
-                    <div class="form-group sm:col-span-3">
+                    <div class="sm:col-span-3">
                         <base-input :label="text.width">
                             <el-select
                                 v-model="form.width" filterable
@@ -54,7 +54,7 @@
                         </base-input>
                     </div>
 
-                    <div class="form-group sm:col-span-3">
+                    <div class="sm:col-span-3">
                         <base-input
                             v-model="form.sort"
                             :label="text.sort"
diff --git a/resources/assets/js/components/Inputs/BaseInput.vue b/resources/assets/js/components/Inputs/BaseInput.vue
index a56664cc2..0eeaa54ea 100644
--- a/resources/assets/js/components/Inputs/BaseInput.vue
+++ b/resources/assets/js/components/Inputs/BaseInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="form-group" :class="[
+  <div :class="[
        {'has-error': error},
        formClasses
        ]">
@@ -9,7 +9,7 @@
       </label>
     </slot>
     <div class="relative" :class="[
-       {'input-group input-group-merge': hasIcon},
+       {'form-icon': hasIcon},
        {'focused': focused},
        {'input-group-alternative': alternative},
        {'has-label': label || $slots.label},
diff --git a/resources/assets/js/views/install/Database.vue b/resources/assets/js/views/install/Database.vue
index ee1e6ca05..6b2e4d5fd 100644
--- a/resources/assets/js/views/install/Database.vue
+++ b/resources/assets/js/views/install/Database.vue
@@ -7,42 +7,34 @@
 
             <form>
                 <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
-                    <div class="sm:col-span-6 form-group required" :class="[{'has-error': form.errors.get('hostname')}]">
+                    <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('hostname')}]">
                         <label for="hostname" class="form-control-label">Hostname</label>
 
-                        <div class="input-group input-group-merge">
-                            <input class="form-element" data-name="hostname" data-value="localhost" @keydown="form.errors.clear('hostname')" v-model="form.hostname" required="required" name="hostname" type="text" value="localhost" id="hostname" />
-                        </div>
+                        <input class="form-element" data-name="hostname" data-value="localhost" @keydown="form.errors.clear('hostname')" v-model="form.hostname" required="required" name="hostname" type="text" value="localhost" id="hostname" />
 
                         <div class="text-red text-sm mt-1 block" v-if="form.errors.has('hostname')" v-html="form.errors.get('hostname')"></div>
                     </div>
 
-                    <div class="sm:col-span-6 form-group required" :class="[{'has-error': form.errors.get('username')}]">
+                    <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('username')}]">
                         <label for="username" class="form-control-label">Username</label>
 
-                        <div class="input-group input-group-merge">
-                            <input class="form-element" data-name="username" @keydown="form.errors.clear('username')" v-model="form.username" required="required" name="username" type="text" id="username" />
-                        </div>
+                        <input class="form-element" data-name="username" @keydown="form.errors.clear('username')" v-model="form.username" required="required" name="username" type="text" id="username" />
 
                         <div class="text-red text-sm mt-1 block" v-if="form.errors.has('username')" v-html="form.errors.get('username')"></div>
                     </div>
 
-                    <div class="sm:col-span-6 form-group" :class="[{'has-error': form.errors.get('password')}]">
+                    <div class="sm:col-span-6" :class="[{'has-error': form.errors.get('password')}]">
                         <label for="password" class="form-control-label">Password</label>
 
-                        <div class="input-group input-group-merge">
-                            <input class="form-element" data-name="password" v-model="form.password" name="password" type="password" value="" id="password" />
-                        </div>
+                        <input class="form-element" data-name="password" v-model="form.password" name="password" type="password" value="" id="password" />
 
                         <div class="text-red text-sm mt-1 block" v-if="form.errors.has('password')" v-html="form.errors.get('password')"></div>
                     </div>
 
-                    <div class="sm:col-span-6 form-group mb--2 required" :class="[{'has-error': form.errors.get('database')}]">
+                    <div class="sm:col-span-6 mb--2 required" :class="[{'has-error': form.errors.get('database')}]">
                         <label for="database" class="form-control-label">Database</label>
 
-                        <div class="input-group input-group-merge">
-                            <input class="form-element" data-name="database" @keydown="form.errors.clear('database')" v-model="form.database" required="required" name="database" type="text" id="database" />
-                        </div>
+                        <input class="form-element" data-name="database" @keydown="form.errors.clear('database')" v-model="form.database" required="required" name="database" type="text" id="database" />
 
                         <div class="text-red text-sm mt-1 block" v-if="form.errors.has('database')" v-html="form.errors.get('database')"></div>
                     </div>
diff --git a/resources/assets/js/views/install/Language.vue b/resources/assets/js/views/install/Language.vue
index 2e265fe36..c42978b86 100644
--- a/resources/assets/js/views/install/Language.vue
+++ b/resources/assets/js/views/install/Language.vue
@@ -2,7 +2,7 @@
     <div>
         <InstallSteps :active_state="active"></InstallSteps>
 
-        <div class="form-group mb-0">
+        <div class="mb-0">
             <form>
                 <select v-model="form.lang" name="lang" id="lang" size="13" class="w-full form-control-label">
                     <option v-for="(name, code) in languages" :value="code">
diff --git a/resources/assets/js/views/install/Settings.vue b/resources/assets/js/views/install/Settings.vue
index 67df7340f..8a1c6e6ff 100644
--- a/resources/assets/js/views/install/Settings.vue
+++ b/resources/assets/js/views/install/Settings.vue
@@ -7,9 +7,7 @@
                 <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('company_name')}]">
                     <label for="company_name" class="form-control-label">Company Name</label>
 
-                    <div class="input-group input-group-merge">
-                        <input class="form-element" data-name="company_name" @keydown="form.errors.clear('company_name')" v-model="form.company_name" required="required" name="company_name" type="text" id="company_name" />
-                    </div>
+                    <input class="form-element" data-name="company_name" @keydown="form.errors.clear('company_name')" v-model="form.company_name" required="required" name="company_name" type="text" id="company_name" />
 
                     <div class="text-red text-sm mt-1 block" v-if="form.errors.has('company_name')" v-html="form.errors.get('company_name')"></div>
                 </div>
@@ -17,9 +15,7 @@
                 <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('company_email')}]">
                     <label for="company_email" class="form-control-label">Company Email</label>
 
-                    <div class="input-group input-group-merge">
-                        <input class="form-element" data-name="company_email" @keydown="form.errors.clear('company_email')" v-model="form.company_email" required="required" name="company_email" type="text" id="company_email" />
-                    </div>
+                    <input class="form-element" data-name="company_email" @keydown="form.errors.clear('company_email')" v-model="form.company_email" required="required" name="company_email" type="text" id="company_email" />
 
                     <div class="text-red text-sm mt-1 block" v-if="form.errors.has('company_email')" v-html="form.errors.get('company_email')"></div>
                 </div>
@@ -27,9 +23,7 @@
                 <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('user_email')}]">
                     <label for="user_email" class="form-control-label">Admin Email</label>
 
-                    <div class="input-group input-group-merge">
-                        <input class="form-element" data-name="user_email" @keydown="form.errors.clear('user_email')" v-model="form.user_email" required="required" name="user_email" type="text" id="user_email" />
-                    </div>
+                    <input class="form-element" data-name="user_email" @keydown="form.errors.clear('user_email')" v-model="form.user_email" required="required" name="user_email" type="text" id="user_email" />
 
                     <div class="text-red text-sm mt-1 block" v-if="form.errors.has('user_email')" v-html="form.errors.get('user_email')"></div>
                 </div>
@@ -37,9 +31,7 @@
                 <div class="sm:col-span-6 required" :class="[{'has-error': form.errors.get('user_password')}]">
                     <label for="user_password" class="form-control-label">Admin Password</label>
 
-                    <div class="input-group input-group-merge">
-                        <input class="form-element" data-name="user_password" @keydown="form.errors.clear('user_password')" v-model="form.user_password" required="required" name="user_password" type="password" value="" id="user_password" />
-                    </div>
+                    <input class="form-element" data-name="user_password" @keydown="form.errors.clear('user_password')" v-model="form.user_password" required="required" name="user_password" type="password" value="" id="user_password" />
 
                     <div class="text-red text-sm mt-1 block" v-if="form.errors.has('user_password')" v-html="form.errors.get('user_password')"></div>
                 </div>
diff --git a/resources/views/banking/recurring_transactions/create.blade.php b/resources/views/banking/recurring_transactions/create.blade.php
index 3395463a7..11e26d93b 100644
--- a/resources/views/banking/recurring_transactions/create.blade.php
+++ b/resources/views/banking/recurring_transactions/create.blade.php
@@ -19,7 +19,7 @@
                     </x-slot>
 
                     <x-slot name="body">
-                        <div class="form-group form-group relative sm:col-span-3">
+                        <div class="relative sm:col-span-3">
                             <label class="form-control-label">
                                 {{ trans('general.date') }}
                             </label>
@@ -74,7 +74,7 @@
                     </x-slot>
 
                     <x-slot name="body">
-                        <div class="form-group form-group relative sm:col-span-3">
+                        <div class="relative sm:col-span-3">
                             <label class="form-control-label">
                                 {{ trans_choice('general.numbers', 1) }}
                             </label>
diff --git a/resources/views/banking/recurring_transactions/edit.blade.php b/resources/views/banking/recurring_transactions/edit.blade.php
index 28b42bb7e..66a0d1c09 100644
--- a/resources/views/banking/recurring_transactions/edit.blade.php
+++ b/resources/views/banking/recurring_transactions/edit.blade.php
@@ -12,7 +12,7 @@
                     </x-slot>
 
                     <x-slot name="body">
-                        <div class="form-group form-group relative sm:col-span-3">
+                        <div class="relative sm:col-span-3">
                             <label class="form-control-label">
                                 {{ trans('general.date') }}
                             </label>
@@ -75,7 +75,7 @@
                     </x-slot>
 
                     <x-slot name="body">
-                        <div class="form-group form-group relative sm:col-span-3">
+                        <div class="relative sm:col-span-3">
                             <label class="form-control-label">
                                 {{ trans_choice('general.numbers', 1) }}
                             </label>
diff --git a/resources/views/components/documents/form/line-item.blade.php b/resources/views/components/documents/form/line-item.blade.php
index 843d06447..53a746e98 100644
--- a/resources/views/components/documents/form/line-item.blade.php
+++ b/resources/views/components/documents/form/line-item.blade.php
@@ -18,7 +18,7 @@
             <tbody>
                 <tr>
                     @stack('move_td_start')
-                    <td class="align-middle border-b-0 move flex items-center justify-center" style="width:24px; height:100px; color: #8898aa;">
+                    <td class="align-middle border-b-0 flex items-center justify-center" style="width:24px; height:100px; color: #8898aa;">
                         <span class="w-6 material-icons">list</span>
                     </td>
                     @stack('move_td_end')
@@ -147,7 +147,7 @@
 
                     @stack('total_td_start')
 
-                    <td class="px-3 py-3 text-right  border-b-0 total">
+                    <td class="px-3 py-3 text-right border-b-0 total">
                         @if (! $hideItemAmount)
                             <div>
                                 <x-form.input.money
@@ -171,7 +171,7 @@
                     @stack('delete_td_start')
 
                     <td class="text-right group">
-                        <button type="button" @click="onDeleteItem(index)" class="btn btn-link btn-delete w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
+                        <button type="button" @click="onDeleteItem(index)" class="w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
                             <span class="w-full material-icons-outlined text-lg text-gray-300 group-hover:text-gray-500">delete</span>
                         </button>
                     </td>
@@ -210,7 +210,7 @@
                         <div v-if="row.add_discount" class="flex items-center justify-between pb-3 ml-2">
                             @stack('discount_input_start')
 
-                            <div class="form-group mb-0 w-100" style="display: inline-block; position: relative;">
+                            <div class="mb-0" style="display: inline-block; position: relative;">
                                 <div class="flex items-center">
                                     <div class="w-16 flex items-center bg-gray-200 p-1 ltr:mr-2 rtl:ml-2 rounded-lg">
                                         <button type="button"
@@ -344,7 +344,7 @@
                                 </div>
 
                                 <div class="pl-2 group">
-                                    <button type="button" @click="onDeleteTax(index, row_tax_index)" class="btn btn-link btn-delete w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
+                                    <button type="button" @click="onDeleteTax(index, row_tax_index)" class="w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
                                         <span class="w-full material-icons-outlined text-lg text-gray-300 group-hover:text-gray-500">delete</span>
                                     </button>
                                 </div>
@@ -409,7 +409,7 @@
                                 </div>
 
                                 <div class="pl-2 group">
-                                    <button type="button" @click="onDeleteTax(index, 999)" class="btn btn-link btn-delete w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
+                                    <button type="button" @click="onDeleteTax(index, 999)" class="w-6 h-7 flex items-center rounded-lg p-0 group-hover:bg-gray-100">
                                         <span class="w-full material-icons-outlined text-lg text-gray-300 group-hover:text-gray-500">delete</span>
                                     </button>
                                 </div>
diff --git a/resources/views/components/documents/form/recurring_metadata.blade.php b/resources/views/components/documents/form/recurring_metadata.blade.php
index 5668d72d9..3a2fc5ea0 100644
--- a/resources/views/components/documents/form/recurring_metadata.blade.php
+++ b/resources/views/components/documents/form/recurring_metadata.blade.php
@@ -25,7 +25,7 @@
         @stack('issue_start')
 
         @if (! $hideIssuedAt)
-        <div class="form-group form-group relative sm:col-span-3">
+        <div class="relative sm:col-span-3">
             <label class="form-control-label">
                 {{ trans($textIssuedAt) }}
             </label>
@@ -61,7 +61,7 @@
         @stack('document_number_start')
 
         @if (! $hideDocumentNumber)
-        <div class="form-group form-group relative sm:col-span-3">
+        <div class="relative sm:col-span-3">
             <label class="form-control-label">
                 {{ trans($textDocumentNumber) }}
             </label>
diff --git a/resources/views/components/form/group/attachment.blade.php b/resources/views/components/form/group/attachment.blade.php
index 2e403ae91..85ed74ca0 100644
--- a/resources/views/components/form/group/attachment.blade.php
+++ b/resources/views/components/form/group/attachment.blade.php
@@ -3,7 +3,7 @@
     label="{{ trans('general.attachment') }}"
     singleWidthClasses
     not-required
-    dropzone-class="w-100"
+    dropzone-class="w-full"
     multiple="multiple"
     :options="['acceptedFiles' => $file_types]"
     form-group-class="sm:col-span-6"
diff --git a/resources/views/components/form/group/checkbox.blade.php b/resources/views/components/form/group/checkbox.blade.php
index d6b466dbc..1884d3018 100644
--- a/resources/views/components/form/group/checkbox.blade.php
+++ b/resources/views/components/form/group/checkbox.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' =>  $readonly,
diff --git a/resources/views/components/form/group/color.blade.php b/resources/views/components/form/group/color.blade.php
index 6393eccec..71b2c2bfa 100644
--- a/resources/views/components/form/group/color.blade.php
+++ b/resources/views/components/form/group/color.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <akaunting-color
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/date.blade.php b/resources/views/components/form/group/date.blade.php
index f2d8bbf48..4e30c6667 100644
--- a/resources/views/components/form/group/date.blade.php
+++ b/resources/views/components/form/group/date.blade.php
@@ -2,7 +2,7 @@
 
     <akaunting-date
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/date_time.blade.php b/resources/views/components/form/group/date_time.blade.php
index 182563955..9f2666b86 100644
--- a/resources/views/components/form/group/date_time.blade.php
+++ b/resources/views/components/form/group/date_time.blade.php
@@ -2,7 +2,7 @@
 
     <akaunting-date
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/editor.blade.php b/resources/views/components/form/group/editor.blade.php
index 8c4c1d03e..81caee40f 100644
--- a/resources/views/components/form/group/editor.blade.php
+++ b/resources/views/components/form/group/editor.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/email.blade.php b/resources/views/components/form/group/email.blade.php
index bd8bb194a..585148a42 100644
--- a/resources/views/components/form/group/email.blade.php
+++ b/resources/views/components/form/group/email.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' =>  $readonly,
@@ -30,7 +30,6 @@
         @endif
 
         <div @class([
-                'input-group input-group-merge',
                 $inputGroupClass,
             ])
         >
diff --git a/resources/views/components/form/group/file.blade.php b/resources/views/components/form/group/file.blade.php
index bfae2707e..f047ba726 100644
--- a/resources/views/components/form/group/file.blade.php
+++ b/resources/views/components/form/group/file.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
@@ -30,7 +30,6 @@
         @endif
 
         <div @class([
-                'input-group input-group-merge',
                 $inputGroupClass,
             ])
         >
diff --git a/resources/views/components/form/group/invoice_text.blade.php b/resources/views/components/form/group/invoice_text.blade.php
index 4e1d67d10..83df697c7 100644
--- a/resources/views/components/form/group/invoice_text.blade.php
+++ b/resources/views/components/form/group/invoice_text.blade.php
@@ -18,7 +18,7 @@
 >
     <akaunting-select
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/number.blade.php b/resources/views/components/form/group/number.blade.php
index 9222eedda..b00f92cba 100644
--- a/resources/views/components/form/group/number.blade.php
+++ b/resources/views/components/form/group/number.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' =>  $readonly,
@@ -30,7 +30,6 @@
         @endif
 
         <div @class([
-                'input-group input-group-merge',
                 $inputGroupClass,
             ])
         >
diff --git a/resources/views/components/form/group/password.blade.php b/resources/views/components/form/group/password.blade.php
index 1837efe26..604c03309 100644
--- a/resources/views/components/form/group/password.blade.php
+++ b/resources/views/components/form/group/password.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' =>  $readonly,
@@ -30,7 +30,6 @@
         @endif
 
         <div @class([
-                'input-group input-group-merge',
                 $inputGroupClass,
             ])
         >
diff --git a/resources/views/components/form/group/radio.blade.php b/resources/views/components/form/group/radio.blade.php
index c44da0e3d..44600cf41 100644
--- a/resources/views/components/form/group/radio.blade.php
+++ b/resources/views/components/form/group/radio.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/select.blade.php b/resources/views/components/form/group/select.blade.php
index 330ac8119..4015567bc 100644
--- a/resources/views/components/form/group/select.blade.php
+++ b/resources/views/components/form/group/select.blade.php
@@ -6,7 +6,7 @@
     <akaunting-select
     @endif
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/text.blade.php b/resources/views/components/form/group/text.blade.php
index 17e1449fa..2c2b4abe7 100644
--- a/resources/views/components/form/group/text.blade.php
+++ b/resources/views/components/form/group/text.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
@@ -30,7 +30,6 @@
         @endif
 
         <div @class([
-                'input-group input-group-merge',
                 $inputGroupClass,
             ])
         >
diff --git a/resources/views/components/form/group/textarea.blade.php b/resources/views/components/form/group/textarea.blade.php
index 98c9b8d0e..13ebc723f 100644
--- a/resources/views/components/form/group/textarea.blade.php
+++ b/resources/views/components/form/group/textarea.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <div
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/time.blade.php b/resources/views/components/form/group/time.blade.php
index 266237431..fc22d3764 100644
--- a/resources/views/components/form/group/time.blade.php
+++ b/resources/views/components/form/group/time.blade.php
@@ -2,7 +2,7 @@
 
     <akaunting-date
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/group/toggle.blade.php b/resources/views/components/form/group/toggle.blade.php
index 76dc75f9d..ae32ace83 100644
--- a/resources/views/components/form/group/toggle.blade.php
+++ b/resources/views/components/form/group/toggle.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
 
     <div
-        class="form-group sm:col-span-3 {{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
+        class="sm:col-span-3 {{ isset($attributes['required']) ? ' required' : '' }}{{ isset($attributes['readonly']) ? ' readonly' : '' }}{{ isset($attributes['disabled']) ? ' disabled' : '' }}"
         :class="[{'has-error': {{ isset($attributes['v-error']) ? $attributes['v-error'] : 'form.errors.get("' . $name . '")' }} }]"
         @if (isset($attributes['show']))
         v-if="{{ $attributes['show'] }}"
diff --git a/resources/views/components/form/input/color.blade.php b/resources/views/components/form/input/color.blade.php
index cf7ac0246..8844580f0 100644
--- a/resources/views/components/form/input/color.blade.php
+++ b/resources/views/components/form/input/color.blade.php
@@ -1,7 +1,7 @@
 @stack($name . '_input_start')
     <akaunting-color
         @class([
-            'form-group relative',
+            'relative',
             $formGroupClass,
             'required' => $required,
             'readonly' => $readonly,
diff --git a/resources/views/components/form/input/select.blade.php b/resources/views/components/form/input/select.blade.php
index 961ce4a40..fd0d88c76 100644
--- a/resources/views/components/form/input/select.blade.php
+++ b/resources/views/components/form/input/select.blade.php
@@ -4,7 +4,7 @@
 <akaunting-select
 @endif
     @class([
-        'form-group relative',
+        'relative',
         $formGroupClass,
         'required' => $required,
         'readonly' => $readonly,
diff --git a/resources/views/install/language/create.blade.php b/resources/views/install/language/create.blade.php
index ac892a3aa..096e51103 100644
--- a/resources/views/install/language/create.blade.php
+++ b/resources/views/install/language/create.blade.php
@@ -4,7 +4,7 @@
     </x-slot>
 
     <x-slot name="content">
-        <div class="form-group mb-0">
+        <div class="mb-0">
             <select name="lang" id="lang" size="14" class="w-full form-control-label">
                 @foreach (language()->allowed() as $code => $name)
                 <option value="{{ $code }}" @if ($code=='en-GB' ) {{ 'selected="selected"' }} @endif>{{ $name }}</option>
diff --git a/resources/views/livewire/common/search.blade.php b/resources/views/livewire/common/search.blade.php
index 1c43a7521..fb45c9f41 100644
--- a/resources/views/livewire/common/search.blade.php
+++ b/resources/views/livewire/common/search.blade.php
@@ -1,5 +1,5 @@
 <form wire:click.stop class="navbar-search navbar-search-light form-inline mb-0" id="navbar-search-main" autocomplete="off">
-    <div class="form-group mb-0 mr-sm-3">
+    <div class="mb-0 mr-sm-3">
         <div class="input-group input-group-alternative input-group-merge">
             <div class="input-group-prepend">
                 <span class="input-group-text">
diff --git a/resources/views/settings/email-templates/edit.blade.php b/resources/views/settings/email-templates/edit.blade.php
index 6616f9301..e3e0aa63b 100644
--- a/resources/views/settings/email-templates/edit.blade.php
+++ b/resources/views/settings/email-templates/edit.blade.php
@@ -44,7 +44,7 @@
                             <div class="grid sm:grid-cols-6 gap-x-8 gap-y-6 my-3.5">
                                 <x-form.group.text name="subject" label="{{ trans('settings.email.templates.subject') }}" form-group-class="sm:col-span-6" />
 
-                                <div class="form-group sm:col-span-6 required" v-if='form.body != null'>
+                                <div class="sm:col-span-6 required" v-if='form.body != null'>
                                     <x-form.label for="body" class="form-control-label">
                                         {{ trans('settings.email.templates.body') }}
                                     </x-form.label>
@@ -56,7 +56,7 @@
                                     ></akaunting-html-editor>
                                 </div>
 
-                                <div class="form-group sm:col-span-6 required" v-if='form.body == null'>
+                                <div class="sm:col-span-6 required" v-if='form.body == null'>
                                     <x-form.group.editor name="body" label="{{ trans('settings.email.templates.body') }}" value="{!! $template->body !!}" v-model='form.body' rows="5" />
                                 </div>