diff --git a/app/DataMapper/CompanySettings.php b/app/DataMapper/CompanySettings.php
index 04abd19bc01a..6e65ccd3a8de 100644
--- a/app/DataMapper/CompanySettings.php
+++ b/app/DataMapper/CompanySettings.php
@@ -447,7 +447,13 @@ class CompanySettings extends BaseSettings
     
     public $mailgun_domain = '';
 
+    public $auto_bill_standard_invoices = false;
+
+    public $email_alignment = 'center'; // center , left, right
+
     public static $casts = [
+        'email_alignment'                    => 'string',
+        'auto_bill_standard_invoices'        => 'bool',
         'postmark_secret'                    => 'string',
         'mailgun_secret'                     => 'string',
         'mailgun_domain'                     => 'string',
diff --git a/app/Http/Controllers/PurchaseOrderController.php b/app/Http/Controllers/PurchaseOrderController.php
index 452c5895374d..821f0c88847a 100644
--- a/app/Http/Controllers/PurchaseOrderController.php
+++ b/app/Http/Controllers/PurchaseOrderController.php
@@ -502,7 +502,6 @@ class PurchaseOrderController extends BaseController
         /*
          * Download Purchase Order/s
          */
-
         if ($action == 'bulk_download' && $purchase_orders->count() >= 1) {
             $purchase_orders->each(function ($purchase_order) {
                 if (auth()->user()->cannot('view', $purchase_order)) {
diff --git a/app/Models/Company.php b/app/Models/Company.php
index 7864220ca00d..0d9d6793890b 100644
--- a/app/Models/Company.php
+++ b/app/Models/Company.php
@@ -66,6 +66,7 @@ class Company extends BaseModel
     protected $presenter = CompanyPresenter::class;
 
     protected $fillable = [
+        'invoice_task_hours',
         'markdown_enabled',
         'calculate_expense_tax_by_amount',
         'invoice_expense_documents',
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 2f20c5300617..77bcae0fa469 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -194,6 +194,7 @@ class CompanyTransformer extends EntityTransformer
             'convert_payment_currency' => (bool) $company->convert_payment_currency,
             'convert_expense_currency' => (bool) $company->convert_expense_currency,
             'notify_vendor_when_paid' => (bool) $company->notify_vendor_when_paid,
+            'invoice_task_hours' => (bool) $company->invoice_task_hours,
         ];
     }
 
diff --git a/database/migrations/2023_01_12_125540_set_auto_bill_on_regular_invoice_setting.php b/database/migrations/2023_01_12_125540_set_auto_bill_on_regular_invoice_setting.php
new file mode 100644
index 000000000000..94339df56d24
--- /dev/null
+++ b/database/migrations/2023_01_12_125540_set_auto_bill_on_regular_invoice_setting.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        
+        Schema::table('accounts', function (Blueprint $table)
+        {
+            $table->boolean('is_trial')->default(false);
+        });
+
+        Schema::table('companies', function (Blueprint $table)
+        {
+            $table->boolean('invoice_task_hours')->default(false);
+        });
+
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};
diff --git a/resources/views/email/template/client.blade.php b/resources/views/email/template/client.blade.php
index 93e772abe888..5fcf2b9bdcd1 100644
--- a/resources/views/email/template/client.blade.php
+++ b/resources/views/email/template/client.blade.php
@@ -1,5 +1,6 @@
 @php
     $primary_color = isset($settings) ? $settings->primary_color : '#4caf50';
+    $email_alignment = isset($settings) ? $settings->email_alignment : 'center';
 @endphp
 
 
@@ -60,7 +61,8 @@
             font-size: 13px;
             padding: 15px 50px;
             font-weight: 600;
-            margin-bottom: 30px;
+            margin-bottom: 5px;
+            margin-top: 10px;
         }
         #content h1 {
             font-family: 'canada-type-gibson', 'roboto', Arial, Helvetica, sans-serif;
@@ -146,8 +148,8 @@
                     </td>
                 </tr>
                 <tr>
-                    <td cellpadding="20">
-                        <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content">
+                    <td cellpadding="5">
+                        <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: {{ $email_alignment }}" id="content">
                                 <div style="padding-top: 10px;"></div>
 
                                 {{ $slot ?? '' }}
@@ -163,8 +165,8 @@
                 </tr>  
                 
                 <tr>
-                  <td height="20">
-                   <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 20px; text-align: center" id="content"> </div>
+                  <td height="0">
+                   <div style="border: 1px solid #c2c2c2; border-top: none; border-bottom: none; padding: 5px; text-align: center" id="content"> </div>
                  </td>
                 </tr>