diff --git a/app/Http/Controllers/ClientPortal/PaymentController.php b/app/Http/Controllers/ClientPortal/PaymentController.php
index 61cdc83456be..b3bbf2a94bcb 100644
--- a/app/Http/Controllers/ClientPortal/PaymentController.php
+++ b/app/Http/Controllers/ClientPortal/PaymentController.php
@@ -232,6 +232,7 @@ class PaymentController extends Controller
     public function response(PaymentResponseRequest $request)
     {
         $gateway = CompanyGateway::find($request->input('company_gateway_id'))->firstOrFail();
+
         $payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$request->payment_hash])->first();
 
         return $gateway
diff --git a/app/PaymentDrivers/BaseDriver.php b/app/PaymentDrivers/BaseDriver.php
index 7e097c704b53..4d4b017beecf 100644
--- a/app/PaymentDrivers/BaseDriver.php
+++ b/app/PaymentDrivers/BaseDriver.php
@@ -460,4 +460,9 @@ class BaseDriver extends AbstractPaymentDriver
 
         return $this;
     }
+
+    public function getCompanyGatewayId(): int
+    {
+        return $this->company_gateway->id;
+    }
 }
diff --git a/app/PaymentDrivers/CustomPaymentDriver.php b/app/PaymentDrivers/CustomPaymentDriver.php
index 03c76eb7007f..3c5d4bad1967 100644
--- a/app/PaymentDrivers/CustomPaymentDriver.php
+++ b/app/PaymentDrivers/CustomPaymentDriver.php
@@ -28,27 +28,15 @@ class CustomPaymentDriver extends BaseDriver
     /**
      * Returns the gateway types.
      */
-    public function gatewayTypes() :array
+    public function gatewayTypes(): array
     {
         $types = [
-            GatewayType::CREDIT_CARD,
+            GatewayType::CUSTOM,
         ];
 
         return $types;
     }
 
-    public function authorize($payment_method)
-    {
-    }
-
-    public function purchase($amount, $return_client_response = false)
-    {
-    }
-
-    public function refund(Payment $payment, $amount, $return_client_response = false)
-    {
-    }
-
     public function setPaymentMethod($payment_method_id)
     {
         $this->payment_method = $payment_method_id;
@@ -56,13 +44,33 @@ class CustomPaymentDriver extends BaseDriver
         return $this;
     }
 
+    /**
+     * View for displaying custom content of the driver.
+     *
+     * @param array $data
+     * @return mixed
+     */
     public function processPaymentView($data)
     {
-        return render('gateways.custom.landing_page', $data);
+        $data['title'] = $this->company_gateway->getConfigField('name');
+        $data['instructions'] = $this->company_gateway->getConfigField('text');
+        
+        $this->payment_hash->data = array_merge((array) $this->payment_hash->data, $data);
+        $this->payment_hash->save();
+        
+        $data['gateway'] = $this;
+
+        return render('gateways.custom.payment', $data);
     }
 
+    /**
+     * Processing method for payment. Should never be reached with this driver.
+     *
+     * @return mixed
+     */
     public function processPaymentResponse($request)
     {
+        return redirect()->route('client.invoices');
     }
 
     /**
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 3eef076b20d0..565053ca7601 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -3314,6 +3314,9 @@ return [
 
     'service' => 'Service',
     'pay' => 'Pay',
+
+    'instructions' => 'Instructions',
+  
     'notification_invoice_reminder1_sent_subject' => 'Reminder 1 for Invoice :invoice was sent to :client',
     'notification_invoice_reminder2_sent_subject' => 'Reminder 2 for Invoice :invoice was sent to :client',
     'notification_invoice_reminder3_sent_subject' => 'Reminder 3 for Invoice :invoice was sent to :client',
diff --git a/resources/views/portal/ninja2020/gateways/checkout/credit_card.blade.php.old b/resources/views/portal/ninja2020/gateways/checkout/credit_card.blade.php.old
deleted file mode 100644
index 71f54319f938..000000000000
--- a/resources/views/portal/ninja2020/gateways/checkout/credit_card.blade.php.old
+++ /dev/null
@@ -1,128 +0,0 @@
-@extends('portal.ninja2020.layout.app')
-@section('meta_title', ctrans('texts.checkout_com'))
-
-@push('head')
-    <meta name="public-key" content="{{ $gateway->getPublishableKey() }}">
-    <meta name="customer-email" content="{{ $customer_email }}">
-    <meta name="value" content="{{ $value }}">
-    <meta name="currency" content="{{ $currency }}">
-    <meta name="reference" content="{{ $payment_hash }}">
-
-    <script src="{{ asset('js/clients/payments/checkout.com.js') }}"></script>
-@endpush
-
-@section('body')
-    <form action="{{ route('client.payments.response') }}" method="post" id="server-response">
-        @csrf
-        <input type="hidden" name="gateway_response">
-        <input type="hidden" name="store_card">
-        <input type="hidden" name="reference" value="{{ $payment_hash }}">
-        <input type="hidden" name="payment_hash" value="{{ $payment_hash }}">
-        <input type="hidden" name="company_gateway_id" value="{{ $company_gateway->id }}">
-        <input type="hidden" name="payment_method_id" value="{{ $payment_method_id }}">
-        <input type="hidden" name="value" value="{{ $value }}">
-        <input type="hidden" name="raw_value" value="{{ $raw_value }}">
-        <input type="hidden" name="currency" value="{{ $currency }}">
-        @isset($token)
-            <input type="hidden" name="token" value="{{ $token->meta->id }}">
-        @endisset
-    </form>
-
-    <div class="container mx-auto">
-        <div class="grid grid-cols-6 gap-4">
-            <div class="col-span-6 md:col-start-2 md:col-span-4">
-                <div class="alert alert-failure mb-4" hidden id="errors"></div>
-                <div class="bg-white shadow overflow-hidden sm:rounded-lg">
-                    <div class="px-4 py-5 border-b border-gray-200 sm:px-6">
-                        <h3 class="text-lg leading-6 font-medium text-gray-900">
-                            {{ ctrans('texts.pay_now') }}
-                        </h3>
-                        <p class="mt-1 max-w-2xl text-sm leading-5 text-gray-500">
-                            {{ ctrans('texts.complete_your_payment') }}
-                        </p>
-                    </div>
-                    <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex items-center">
-                        <dt class="text-sm leading-5 font-medium text-gray-500 mr-4">
-                            {{ ctrans('texts.payment_type') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ ctrans('texts.checkout_com') }} ({{ ctrans('texts.credit_card') }})
-                        </dd>
-                    </div>
-                    <div class="bg-white px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6 flex items-center">
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.subtotal') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ App\Utils\Number::formatMoney($total['invoice_totals'], $client) }}
-                        </dd>
-                        <dt class="text-sm leading-5 font-medium text-gray-500">
-                            {{ ctrans('texts.gateway_fees') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            {{ App\Utils\Number::formatMoney($total['fee_total'], $client) }}
-                        </dd>
-                        <dt class="text-sm leading-5 font-medium text-gray-500 mr-4">
-                            {{ ctrans('texts.amount') }}
-                        </dt>
-                        <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                            <span class="font-bold">{{ App\Utils\Number::formatMoney($total['amount_with_fee'], $client) }}</span>
-                        </dd>
-                    </div>
-                    @isset($token)
-                        <div class="bg-gray-50 px-4 py-5 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
-                            <dt class="text-sm leading-5 font-medium text-gray-500">
-                                {{ ctrans('texts.card_number') }}
-                            </dt>
-                            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                **** {{ ucfirst($token->meta->last4) }}
-                            </dd>
-                        </div>
-                        <div class="bg-white px-4 py-5 flex justify-end">
-                            <button class="button button-primary bg-primary" onclick="document.getElementById('server-response').submit()">
-                                {{ ctrans('texts.pay_now') }}
-                            </button>
-                        </div>
-                    @else
-                        <div class="{{ ($gateway->company_gateway->token_billing == 'optin' || $gateway->company_gateway->token_billing == 'optout') ? 'sm:grid' : 'hidden' }} bg-gray-50 px-4 py-5 sm:grid-cols-3 sm:gap-4 sm:px-6">
-                            <dt class="text-sm leading-5 font-medium text-gray-500">
-                                {{ ctrans('texts.token_billing_checkbox') }}
-                            </dt>
-                            <dd class="mt-1 text-sm leading-5 text-gray-900 sm:mt-0 sm:col-span-2">
-                                <label class="mr-4">
-                                    <input 
-                                        type="radio"
-                                        class="form-radio cursor-pointer" 
-                                        name="token-billing-checkbox" 
-                                        id="proxy_is_default"
-                                        value="true"
-                                        {{ ($gateway->company_gateway->token_billing == 'always' || $gateway->company_gateway->token_billing == 'optout') ? 'checked' : '' }} />
-                                    <span class="ml-1 cursor-pointer">{{ ctrans('texts.yes') }}</span>
-                                </label>
-                                <label>
-                                    <input 
-                                        type="radio" 
-                                        class="form-radio cursor-pointer" 
-                                        name="token-billing-checkbox" 
-                                        id="proxy_is_default" 
-                                        value="false"
-                                        {{ ($gateway->company_gateway->token_billing == 'off' || $gateway->company_gateway->token_billing == 'optin') ? 'checked' : '' }} />
-                                    <span class="ml-1 cursor-pointer">{{ ctrans('texts.no') }}</span>
-                                </label>
-                            </dd>
-                        </div>
-                        <div class="bg-white px-4 py-5 flex justify-end">
-                            <form class="payment-form" method="POST" action="https://merchant.com/successUrl">
-                                @if(app()->environment() == 'production')
-                                    <script async src="https://cdn.checkout.com/js/checkout.js"></script>
-                                @else
-                                    <script async src="https://cdn.checkout.com/sandbox/js/checkout.js"></script>
-                                @endif
-                            </form>
-                        </div>
-                    @endisset
-                </div>
-            </div>
-        </div>
-    </div>
-@endsection
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/gateways/custom/landing_page.blade.php b/resources/views/portal/ninja2020/gateways/custom/landing_page.blade.php
deleted file mode 100644
index 5129524a8bee..000000000000
--- a/resources/views/portal/ninja2020/gateways/custom/landing_page.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-stubs
\ No newline at end of file
diff --git a/resources/views/portal/ninja2020/gateways/custom/payment.blade.php b/resources/views/portal/ninja2020/gateways/custom/payment.blade.php
new file mode 100644
index 000000000000..d337c71897d9
--- /dev/null
+++ b/resources/views/portal/ninja2020/gateways/custom/payment.blade.php
@@ -0,0 +1,13 @@
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => $title, 'card_title' => $title])
+
+@section('gateway_content')
+    @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.payment_type')])
+        {{ $title }}
+    @endcomponent
+
+    @include('portal.ninja2020.gateways.includes.payment_details')
+
+    @component('portal.ninja2020.components.general.card-element-single')
+        {!! nl2br($instructions) !!}
+    @endcomponent
+@endsection
diff --git a/resources/views/portal/ninja2020/invoices/payment.blade.php b/resources/views/portal/ninja2020/invoices/payment.blade.php
index 66ecc2a0ece5..f911440f30ed 100644
--- a/resources/views/portal/ninja2020/invoices/payment.blade.php
+++ b/resources/views/portal/ninja2020/invoices/payment.blade.php
@@ -36,9 +36,15 @@
                                 <div class="bg-white rounded-md shadow-xs">
                                     <div class="py-1">
                                         @foreach($payment_methods as $payment_method)
-                                        <a href="#" @click="{ open = false }" data-company-gateway-id="{{ $payment_method['company_gateway_id'] }}" data-gateway-type-id="{{ $payment_method['gateway_type_id'] }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 dropdown-gateway-button hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900" data-cy="payment-method">
-                                            {{ $payment_method['label'] }}
-                                        </a>
+                                            @if($payment_method['label'] == 'Custom')
+                                                <a href="#" @click="{ open = false }" data-company-gateway-id="{{ $payment_method['company_gateway_id'] }}" data-gateway-type-id="{{ $payment_method['gateway_type_id'] }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 dropdown-gateway-button hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900" data-cy="payment-method">
+                                                    {{ \App\Models\CompanyGateway::find($payment_method['company_gateway_id'])->firstOrFail()->getConfigField('name') }}
+                                                </a>
+                                            @else
+                                                <a href="#" @click="{ open = false }" data-company-gateway-id="{{ $payment_method['company_gateway_id'] }}" data-gateway-type-id="{{ $payment_method['gateway_type_id'] }}" class="block px-4 py-2 text-sm leading-5 text-gray-700 dropdown-gateway-button hover:bg-gray-100 hover:text-gray-900 focus:outline-none focus:bg-gray-100 focus:text-gray-900" data-cy="payment-method">
+                                                    {{ $payment_method['label'] }}
+                                                </a>
+                                            @endif
                                         @endforeach
                                     </div>
                                 </div>
@@ -67,7 +73,7 @@
                     <div>
                         <dl>
                             @if(!empty($invoice->number) && !is_null($invoice->number))
-                            <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
                                 <dt class="text-sm font-medium leading-5 text-gray-500">
                                     {{ ctrans('texts.invoice_number') }}
                                 </dt>
@@ -88,7 +94,7 @@
                             </div>
                             @endif
 
-                            <div class="px-4 py-5 bg-gray-50 sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
+                            <div class="px-4 py-5 bg-white sm:grid sm:grid-cols-3 sm:gap-4 sm:px-6">
                                 <dt class="text-sm font-medium leading-5 text-gray-500">
                                     {{ ctrans('texts.additional_info') }}
                                 </dt>