diff --git a/resources/views/setup/_account.blade.php b/resources/views/setup/_account.blade.php
index 1d97dfee9..12b5a1dbd 100644
--- a/resources/views/setup/_account.blade.php
+++ b/resources/views/setup/_account.blade.php
@@ -14,7 +14,7 @@
                     {{ ctrans('texts.first_name') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="first_name" value="{{ old('first_name') }}">
+                    <input type="text" class="input w-full" name="first_name" value="{{ old('first_name') }}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -22,7 +22,7 @@
                     {{ ctrans('texts.last_name') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="last_name" value="{{ old('last_name') }}">
+                    <input type="text" class="input w-full" name="last_name" value="{{ old('last_name') }}">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -30,7 +30,7 @@
                     {{ ctrans('texts.email') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="email" class="input" name="email" value="{{ old('email') }}">
+                    <input type="email" class="input w-full" name="email" value="{{ old('email') }}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -38,7 +38,7 @@
                     {{ ctrans('texts.password') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="password" class="input" name="password">
+                    <input type="password" class="input w-full" name="password">
                 </dd>
             </div>
         </dl>
diff --git a/resources/views/setup/_application.blade.php b/resources/views/setup/_application.blade.php
index 7ee991452..02bdc68df 100644
--- a/resources/views/setup/_application.blade.php
+++ b/resources/views/setup/_application.blade.php
@@ -14,7 +14,7 @@
                     {{ ctrans('texts.url') }}*
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="url" required value="{{ old('url') }}">
+                    <input type="text" class="input w-full" name="url" required value="{{ old('url') }}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -42,7 +42,7 @@
                 <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
                     <input type="checkbox" class="form-checkbox mr-1" name="send_logs" {{ old('send_logs' ? 'checked': '') }}>
                     <span>{{ ctrans('texts.send_fail_logs_to_our_server') }}</span>
-                    <a href="https://www.invoiceninja.com/privacy-policy/">Read more about how we use this</a>
+                    <a class="button-link mt-1 block" href="https://www.invoiceninja.com/privacy-policy/">Read more about how we use this.</a>
                 </dd>
             </div>
         </dl>
diff --git a/resources/views/setup/_database.blade.php b/resources/views/setup/_database.blade.php
index e3f6f40ec..159bd9295 100644
--- a/resources/views/setup/_database.blade.php
+++ b/resources/views/setup/_database.blade.php
@@ -30,7 +30,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.driver') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input border-none" name="db_driver" value="MySQL" readonly>
+                    <input type="text" class="border-none" name="db_driver" value="MySQL" readonly>
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -38,7 +38,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.host') }}*
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="host" required value="{{ old('host') }}">
+                    <input type="text" class="input w-full" name="host" required value="{{ old('host') }}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -46,7 +46,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.database') }}*
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="database" required value="{{ old('database') }}">
+                    <input type="text" class="input w-full" name="database" required value="{{ old('database') }}">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -54,7 +54,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.username') }}*
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="db_username" required value="{{ old('db_username') }}">
+                    <input type="text" class="input w-full" name="db_username" required value="{{ old('db_username') }}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -62,7 +62,7 @@ FLUSH PRIVILEGES;
                     {{ ctrans('texts.password') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="password" class="input" name="db_password" value="{{ old('db_password') }}">
+                    <input type="password" class="input w-full" name="db_password" value="{{ old('db_password') }}">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
diff --git a/resources/views/setup/_mail.blade.php b/resources/views/setup/_mail.blade.php
index 4b32ea589..aa7ec3a98 100644
--- a/resources/views/setup/_mail.blade.php
+++ b/resources/views/setup/_mail.blade.php
@@ -14,7 +14,7 @@
                     {{ ctrans('texts.driver') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <select name="mail_driver" class="input form-select">
+                    <select name="mail_driver" class="input w-full form-select">
                         <option value="smtp">SMTP</option>
                         <option value="mail">Mail</option>
                         <option value="sendmail">Sendmail</option>
@@ -26,7 +26,7 @@
                     {{ ctrans('texts.from_name') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="mail_name" value="{{ old('mail_name') }}">
+                    <input type="text" class="input w-full" name="mail_name" value="{{ old('mail_name') }}">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -34,7 +34,7 @@
                     {{ ctrans('texts.from_address') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="email" class="input" name="mail_address" value="{{ old('mail_address') }}">
+                    <input type="email" class="input w-full" name="mail_address" value="{{ old('mail_address') }}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -42,7 +42,7 @@
                     {{ ctrans('texts.username') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="mail_username" value="{{ old('mail_username') }}">
+                    <input type="text" class="input w-full" name="mail_username" value="{{ old('mail_username') }}">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -50,7 +50,7 @@
                     {{ ctrans('texts.host') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="mail_host" value="{{ old('mail_host') }}">
+                    <input type="text" class="input w-full" name="mail_host" value="{{ old('mail_host') }}">
                 </dd>
             </div>
             <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -58,7 +58,7 @@
                     {{ ctrans('texts.port') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="text" class="input" name="mail_port" value="{{ old('mail_port') }}">
+                    <input type="text" class="input w-full" name="mail_port" value="{{ old('mail_port') }}">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
@@ -66,7 +66,7 @@
                     {{ ctrans('texts.encryption') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <select name="encryption" class="input form-select">
+                    <select name="encryption" class="input w-full form-select">
                         <option value="tls">TLS</option>
                         <option value="ssl">SSL</option>
                     </select>
@@ -77,7 +77,7 @@
                     {{ ctrans('texts.password') }}
                 </dt>
                 <dd class="text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                    <input type="password" class="input" name="mail_password">
+                    <input type="password" class="input w-full" name="mail_password">
                 </dd>
             </div>
             <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 sm:flex sm:items-center">
diff --git a/resources/views/setup/index.blade.php b/resources/views/setup/index.blade.php
index bcf808be6..5860bdf62 100644
--- a/resources/views/setup/index.blade.php
+++ b/resources/views/setup/index.blade.php
@@ -47,14 +47,14 @@
 
                     <div class="flex justify-center mt-4">
                         <div class="flex flex-col">
-                            <div class="mt-4">
-                                <input type="checkbox" class="form-checkbox" name="terms_of_service" required>
+                            <div class="mt-4 text-sm">
+                                <input type="checkbox" class="form-checkbox mr-2" name="terms_of_service" required>
                                 <span>I agree to
                                     <a class="button-link" href="https://www.invoiceninja.com/self-hosting-terms-service/">{{ ctrans('texts.terms_of_service') }}</a>
                                 </span>
                             </div>
-                            <div class="mt-2">
-                                <input type="checkbox" class="form-checkbox" name="privacy_policy" required>
+                            <div class="mt-2 text-sm">
+                                <input type="checkbox" class="form-checkbox mr-2" name="privacy_policy" required>
                                 <span>I agree to
                                     <a class="button-link" href="https://www.invoiceninja.com/self-hosting-privacy-data-control/">{{ ctrans('texts.privacy_policy') }}</a>
                                 </span>