diff --git a/app/frontend/images/payzen-secure.png b/app/frontend/images/payzen-secure.png
index 438d724ce..aefcb7f3f 100644
Binary files a/app/frontend/images/payzen-secure.png and b/app/frontend/images/payzen-secure.png differ
diff --git a/app/frontend/src/javascript/components/base/payment-modal.tsx b/app/frontend/src/javascript/components/base/payment-modal.tsx
index 2508f79ea..8bbf575da 100644
--- a/app/frontend/src/javascript/components/base/payment-modal.tsx
+++ b/app/frontend/src/javascript/components/base/payment-modal.tsx
@@ -165,14 +165,14 @@ export const PaymentModal: React.FC<PaymentModalProps> = ({ isOpen, toggleModal,
               width={ModalSize.medium}
               closeButton={false}
               customFooter={logoFooter}
-              className={`payment-modal ${className}`}>
+              className={`payment-modal ${className ? className : ''}`}>
       {ready && <div>
         <WalletInfo cartItems={cartItems} currentUser={currentUser} wallet={wallet} price={price?.price} />
         <GatewayForm onSubmit={handleSubmit}
                      onSuccess={handleFormSuccess}
                      onError={handleFormError}
                      operator={currentUser}
-                     className={`gateway-form ${formClassName}`}
+                     className={`gateway-form ${formClassName ? formClassName : ''}`}
                      formId={formId}
                      cartItems={cartItems}
                      customer={customer}
diff --git a/app/frontend/src/javascript/components/payzen/payzen-modal.tsx b/app/frontend/src/javascript/components/payzen/payzen-modal.tsx
index 389b7400d..fc96a5774 100644
--- a/app/frontend/src/javascript/components/payzen/payzen-modal.tsx
+++ b/app/frontend/src/javascript/components/payzen/payzen-modal.tsx
@@ -1,6 +1,5 @@
 import React, { FunctionComponent, ReactNode } from 'react';
 import { react2angular } from 'react2angular';
-import { useTranslation } from 'react-i18next';
 import { Loader } from '../base/loader';
 import { IApplication } from '../../models/application';
 import { CartItems, PaymentConfirmation } from '../../models/payment';
@@ -35,7 +34,6 @@ const PayZenModal: React.FC<PayZenModalProps> = ({ isOpen, toggleModal, afterSuc
   const logoFooter = (): ReactNode => {
     return (
       <div className="payzen-modal-icons">
-        <i className="fa fa-lock fa-2x m-r-sm pos-rlt" />
         <img src={payzenLogo} alt="powered by PayZen" />
         <img src={mastercardLogo} alt="mastercard" />
         <img src={visaLogo} alt="visa" />
@@ -62,7 +60,9 @@ const PayZenModal: React.FC<PayZenModalProps> = ({ isOpen, toggleModal, afterSuc
     <PaymentModal isOpen={isOpen}
                   toggleModal={toggleModal}
                   logoFooter={logoFooter()}
-                  formId="payzen-modal"
+                  formId="payzen-form"
+                  formClassName="payzen-form"
+                  className="payzen-modal"
                   currentUser={currentUser}
                   cartItems={cartItems}
                   customer={customer}
@@ -80,4 +80,4 @@ const PayZenModalWrapper: React.FC<PayZenModalProps> = ({ isOpen, toggleModal, a
   );
 }
 
-Application.Components.component('payZenModal', react2angular(PayZenModalWrapper, ['isOpen', 'toggleModal', 'afterSuccess','currentUser', 'schedule', 'cartItems', 'customer']));
+Application.Components.component('payzenModal', react2angular(PayZenModalWrapper, ['isOpen', 'toggleModal', 'afterSuccess','currentUser', 'schedule', 'cartItems', 'customer']));
diff --git a/app/frontend/src/stylesheets/application.scss b/app/frontend/src/stylesheets/application.scss
index 50453f44c..b48ee1029 100644
--- a/app/frontend/src/stylesheets/application.scss
+++ b/app/frontend/src/stylesheets/application.scss
@@ -39,5 +39,6 @@
 @import "modules/payzen-keys-form";
 @import "modules/payzen-settings";
 @import "modules/payment-modal";
+@import "modules/payzen-modal";
 
 @import "app.responsive";
diff --git a/app/frontend/src/stylesheets/modules/payzen-modal.scss b/app/frontend/src/stylesheets/modules/payzen-modal.scss
new file mode 100644
index 000000000..29388050d
--- /dev/null
+++ b/app/frontend/src/stylesheets/modules/payzen-modal.scss
@@ -0,0 +1,9 @@
+.payzen-modal {
+  .payzen-modal-icons {
+    text-align: center;
+
+    img {
+      margin-right: 10px;
+    }
+  }
+}
diff --git a/app/frontend/templates/shared/_cart.html b/app/frontend/templates/shared/_cart.html
index 99e3f5def..9e7301153 100644
--- a/app/frontend/templates/shared/_cart.html
+++ b/app/frontend/templates/shared/_cart.html
@@ -200,7 +200,7 @@
 
 </div>
 <div ng-if="stripe.showModal">
-  <stripe-modal is-open="stripe.showModal"
+  <payzen-modal is-open="stripe.showModal"
                 toggle-modal="toggleStripeModal"
                 after-success="afterStripeSuccess"
                 cart-items="stripe.cartItems"
diff --git a/lib/pay_zen/helper.rb b/lib/pay_zen/helper.rb
index e1ba0e20d..f67dd47cd 100644
--- a/lib/pay_zen/helper.rb
+++ b/lib/pay_zen/helper.rb
@@ -7,6 +7,7 @@ module PayZen; end
 class PayZen::Helper
   class << self
     def enabled?
+      return false unless Setting.get('online_payment_module')
       return false unless Setting.get('payment_gateway') == 'payzen'
 
       res = true