diff --git a/_dev/js/front/src/components/common/card-fields.component.js b/_dev/js/front/src/components/common/card-fields.component.js
index 66b7da85c..adc16e41f 100644
--- a/_dev/js/front/src/components/common/card-fields.component.js
+++ b/_dev/js/front/src/components/common/card-fields.component.js
@@ -170,10 +170,14 @@ export class CardFieldsComponent extends BaseComponent {
         input: {
           'font-size': '17px',
           'font-family': 'helvetica, tahoma, calibri, sans-serif',
-          color: '#3a3a3a'
+          color: '#3a3a3a',
+          padding: '8px 12px'
         },
         ':focus': {
           color: 'black'
+        },
+        body: {
+          padding: '0px'
         }
       },
       ...(this.configPayPal.hostedFieldsCustomization || {}),
diff --git a/_dev/js/front/src/components/common/payment-option.component.js b/_dev/js/front/src/components/common/payment-option.component.js
index 5648b80b0..76cb926c7 100644
--- a/_dev/js/front/src/components/common/payment-option.component.js
+++ b/_dev/js/front/src/components/common/payment-option.component.js
@@ -18,7 +18,6 @@
  */
 import { BaseComponent } from '../../core/dependency-injection/base.component';
 
-import { HostedFieldsComponent } from './hosted-fields.component';
 import { MarkComponent } from './marker.component';
 import { SmartButtonComponent } from './smart-button.component';
 import { PaymentFieldsComponent } from "./payment-fields.component";
diff --git a/_dev/js/front/src/service/query-selector.service/default-selectors/default-selectors-ps1_6.js b/_dev/js/front/src/service/query-selector.service/default-selectors/default-selectors-ps1_6.js
index 45a6117c9..9651d76c4 100644
--- a/_dev/js/front/src/service/query-selector.service/default-selectors/default-selectors-ps1_6.js
+++ b/_dev/js/front/src/service/query-selector.service/default-selectors/default-selectors-ps1_6.js
@@ -45,6 +45,7 @@ export const DefaultSelectors1_6 = {
   PAY_LATER_BANNER_CONTAINER: '.header-container',
 
   CARD_FIELDS: {
+    FORM: '#ps_checkout-card-fields-form',
     NAME: '#ps_checkout-card-fields-card-name',
     NUMBER: '#ps_checkout-card-fields-card-number',
     EXPIRY: '#ps_checkout-card-fields-card-expiry',