diff --git a/Api/GooglePayRequestDataProviderInterface.php b/Api/GooglePayRequestDataProviderInterface.php
new file mode 100644
index 00000000..277ba3b9
--- /dev/null
+++ b/Api/GooglePayRequestDataProviderInterface.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Class CreateCreditCardDataProviderInterface
+ *
+ *
+ * @author      Open Source Team
+ * @copyright   2021 Pagar.me (https://pagar.me)
+ * @license     https://pagar.me Copyright
+ *
+ * @link        https://pagar.me
+ */
+
+namespace Pagarme\Pagarme\Api;
+
+
+interface GooglePayRequestDataProviderInterface extends BaseRequestDataProviderInterface
+{
+    /**
+     * @return string
+     */
+    public function getCustomerAddressStreet($shipping);
+
+    /**
+     * @return string
+     */
+    public function getCustomerAddressNumber($shipping);
+
+    /**
+     * @return string
+     */
+    public function getCustomerAddressComplement($shipping);
+
+    /**
+     * @return string
+     */
+    public function getCustomerAddressDistrict($shipping);
+}
diff --git a/Api/KycLinkResponseInterface.php b/Api/KycLinkResponseInterface.php
new file mode 100644
index 00000000..8e1c34fb
--- /dev/null
+++ b/Api/KycLinkResponseInterface.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Pagarme\Pagarme\Api;
+
+interface KycLinkResponseInterface
+{
+    const DATA_URL = 'url';
+    const DATA_QR_CODE = 'qrCode';
+
+    /**
+     * @return string
+     */
+    public function getUrl();
+
+    /**
+     * @return string
+     */
+    public function getQrCode();
+
+    /**
+     * @param string $url
+     * @return $this
+     */
+    public function setUrl(string $url);
+
+    /**
+     * @param string $qrCode
+     * @return $this
+     */
+    public function setQrCode(string $qrCode);
+}
\ No newline at end of file
diff --git a/Api/RecipientInterface.php b/Api/RecipientInterface.php
index cc10b1a4..750e13ae 100644
--- a/Api/RecipientInterface.php
+++ b/Api/RecipientInterface.php
@@ -17,4 +17,10 @@ public function saveFormData();
      * @return string
      */
     public function searchRecipient(): string;
+
+    /**
+     * @param string $id
+     * @return KycLinkResponseInterface
+     */
+    public function createKycLink(string $id);
 }
diff --git a/Block/Adminhtml/Marketplace/Recipient.php b/Block/Adminhtml/Marketplace/Recipient.php
index 18b0b60f..5c049140 100644
--- a/Block/Adminhtml/Marketplace/Recipient.php
+++ b/Block/Adminhtml/Marketplace/Recipient.php
@@ -2,17 +2,23 @@
 
 namespace Pagarme\Pagarme\Block\Adminhtml\Marketplace;
 
+use Exception;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
+use Magento\Directory\Model\Country;
 use Magento\Framework\Registry;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\Element\Template\Context;
-use Pagarme\Pagarme\Concrete\Magento2CoreSetup;
-use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory as CustomerCollectionFactory;
 use Pagarme\Core\Marketplace\Repositories\RecipientRepository;
+use Pagarme\Pagarme\Concrete\Magento2CoreSetup;
 use stdClass;
+use Pagarme\Core\Marketplace\Interfaces\RecipientInterface as CoreRecipientInterface;
 
 class Recipient extends Template
 {
-
+    /**
+     * @var Collection
+     */
     private $customerCollection;
 
     /**
@@ -25,7 +31,6 @@ class Recipient extends Template
      */
     private $coreRegistry;
 
-
     /**
      * @var array
      */
@@ -36,28 +41,48 @@ class Recipient extends Template
      */
     private $recipient = null;
 
+    /**
+     * @var Country
+     */
+    private $country;
+
 
     /**
      * Link constructor.
      * @param Context $context
+     * @param Registry $registry
+     * @param CustomerCollectionFactory $customerCollectionFactory
+     * @param Country $country
+     * @throws Exception
      */
     public function __construct(
-        Context $context,
-        Registry $registry,
-        CustomerCollectionFactory $customerCollectionFactory
-    ) {
+        Context                   $context,
+        Registry                  $registry,
+        CustomerCollectionFactory $customerCollectionFactory,
+        Country                   $country,
+        RecipientRepository       $recipientRepository
+    )
+    {
         $this->coreRegistry = $registry;
         $this->customerCollection = $customerCollectionFactory->create();
-        $this->recipientRepository = new RecipientRepository();
+        $this->recipientRepository = $recipientRepository;
+        $this->country = $country;
 
         Magento2CoreSetup::bootstrap();
+        $this->init();
         parent::__construct($context, []);
+    }
 
+    protected function init()
+    {
         $recipientData = $this->coreRegistry->registry('recipient_data');
         if (!empty($recipientData)) {
             $this->recipient = json_decode($recipientData);
             $this->recipient->recipient->externalId = $this->recipient->externalId;
             $this->recipient->recipient->localId = $this->recipient->localId;
+            $this->recipient->recipient->status = $this->recipient->status;
+            $this->recipient->recipient->statusUpdated = $this->recipient->statusUpdated;
+            $this->recipient->recipient->statusLabel = $this->buildStatusLabel($this->recipient->recipient->status);
             $this->recipient = $this->recipient->recipient;
         }
 
@@ -127,4 +152,64 @@ public function getSellers()
 
         return $this->sellers;
     }
-}
\ No newline at end of file
+
+    /**
+     * @param string $countryCode
+     * @return array
+     */
+    public function getAllRegionsOfCountry($countryCode = 'BR')
+    {
+        return $this->country->loadByCode($countryCode)->getRegions()->getData();
+    }
+
+    public function getLabel($key)
+    {
+        $labels = [
+            'no' => 'No',
+            'yes' => 'Yes',
+            'document_type' => 'Document type',
+            'document_number' => 'Document number',
+            'name' => 'Name',
+            'mother_name' => 'Mother name',
+            'email' => 'E-mail',
+            'birthdate' => 'Date of birth',
+            'monthly_income' => 'Monthly income',
+            'profession' => 'Profession',
+            'contact_type' => 'Contact type',
+            'contact_number' => 'Contact number',
+            'mobile_phone' => 'Mobile phone',
+            'street' => 'Street',
+            'number' => 'Number',
+            'complement' => 'Complement',
+            'neighborhood' => 'Neighborhood',
+            'reference_point' => 'Reference point',
+            'state' => 'State/Province',
+            'city' => 'City',
+            'zip' => 'Zip/Postal Code',
+            'select' => 'Select',
+        ];
+
+        return __($labels[$key]);
+    }
+
+    /**
+     * @param string|null $status
+     * @return string|null
+     */
+    private function buildStatusLabel($status)
+    {
+        if (!is_string($status)) {
+            return $status;
+        }
+
+        if ($status === CoreRecipientInterface::ACTIVE) {
+            $status = 'approved';
+        }
+
+        $statusWords = explode('_', $status);
+        $statusWords = array_map('ucfirst', $statusWords);
+        $statusLabel = implode(" ", $statusWords);
+        $statusLabel = trim($statusLabel);
+        return __($statusLabel);
+    }
+}
diff --git a/Block/Customer/Marketplace/Kyc.php b/Block/Customer/Marketplace/Kyc.php
new file mode 100644
index 00000000..98123226
--- /dev/null
+++ b/Block/Customer/Marketplace/Kyc.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @author      Open Source Team
+ * @copyright   2024 Pagar.me (https://pagar.me)
+ * @license     https://pagar.me Copyright
+ *
+ * @link        https://pagar.me
+ */
+declare(strict_types=1);
+
+namespace Pagarme\Pagarme\Block\Customer\Marketplace;
+
+use Magento\Customer\Model\Session;
+use Pagarme\Pagarme\Model\Recipient;
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Pagarme\Pagarme\Model\ResourceModel\Recipients\CollectionFactory;
+
+class Kyc extends Template
+{
+    /**
+     * @var Session
+     */
+    protected $customerSession;
+
+    /**
+     * @var CollectionFactory
+     */
+    protected $collectionFactory;
+
+    /**
+     * @param Context $context
+     * @param Session $customerSession
+     * @param CollectionFactory $collectionFactory
+     * @param array $data
+     */
+    public function __construct(
+        Template\Context  $context,
+        Session           $customerSession,
+        CollectionFactory $collectionFactory,
+        array             $data = [])
+    {
+        $this->customerSession = $customerSession;
+        $this->collectionFactory = $collectionFactory;
+        parent::__construct($context, $data);
+    }
+    
+
+    /**
+     * @return Recipient
+     */
+    public function getRecipient()
+    {
+        return $this->collectionFactory->create()->addFieldToFilter(
+            'external_id',
+            ['eq' => $this->getCustomerId()]
+        )->getFirstItem();
+    }
+
+    /**
+     * Get customerId
+     *
+     * @return int
+     */
+    protected function getCustomerId()
+    {
+        return $this->customerSession->getCustomerId();
+    }
+}
diff --git a/Block/Payment/Info/BaseCardInfo.php b/Block/Payment/Info/BaseCardInfo.php
new file mode 100644
index 00000000..7c7a72c3
--- /dev/null
+++ b/Block/Payment/Info/BaseCardInfo.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Pagarme\Pagarme\Block\Payment\Info;
+
+use Exception;
+use Magento\Payment\Block\Info\Cc;
+use Pagarme\Core\Kernel\Services\OrderService;
+use Pagarme\Pagarme\Concrete\Magento2CoreSetup;
+use Pagarme\Core\Kernel\ValueObjects\Id\OrderId;
+use Magento\Framework\Exception\LocalizedException;
+use Pagarme\Core\Kernel\Exceptions\InvalidParamException;
+use Pagarme\Pagarme\Concrete\Magento2PlatformOrderDecorator;
+
+abstract class BaseCardInfo extends Cc
+{
+
+    /**
+     * @return array
+     * @throws InvalidParamException
+     * @throws LocalizedException
+     * @throws Exception
+     */
+    public function getTransactionInfo()
+    {
+        Magento2CoreSetup::bootstrap();
+        $orderService = new OrderService();
+
+        $orderEntityId = $this->getInfo()->getOrder()->getIncrementId();
+        $platformOrder = $this->loadPlatformOrderByIncrementId($orderEntityId);
+
+        $orderPagarmeId = $platformOrder->getPagarmeId();
+
+        if ($orderPagarmeId === null) {
+            return [];
+        }
+
+        $orderObject = $this->getOrderObjectByPagarmeId($orderService, $orderPagarmeId);
+
+        if ($orderObject === null || !is_object($orderObject)) {
+            return [];
+        }
+
+        $charge = current($orderObject->getCharges());
+        $lastFourDigitsWithDots = sprintf(
+            "**** **** **** %s",
+            $charge->getLastTransaction()->getCardData()->getLastFourDigits()->getValue()
+        );
+        return array_merge(
+            $charge->getAcquirerTidCapturedAndAuthorize(),
+            ['tid' => $charge->getLastTransaction()->getAcquirerTid() ?? ""],
+            ['cardBrand' => $charge->getLastTransaction()->getCardData()->getBrand()->getName() ?? ""],
+            ['installments' => $this->getInfo()->getAdditionalInformation('cc_installments') ?? ""],
+            ['lastFour' => $lastFourDigitsWithDots],
+            ['acquirerMessage' => $charge->getLastTransaction()->getAcquirerMessage() ?? ""]
+        );
+    }
+
+    /**
+     * @param mixed $orderService
+     * @param mixed $pagarmeId
+     * @return mixed
+     */
+    protected function getOrderObjectByPagarmeId($orderService, $pagarmeId)
+    {
+        $orderId = new OrderId($pagarmeId);
+        return $orderService->getOrderByPagarmeId($orderId);
+    }
+    /**
+     * @param mixed $incrementId
+     * @return Magento2PlatformOrderDecorator
+     */
+    protected function loadPlatformOrderByIncrementId($incrementId)
+    {
+        $platformOrder = new Magento2PlatformOrderDecorator();
+        $platformOrder->loadByIncrementId($incrementId);
+        return $platformOrder;
+    }
+}
diff --git a/Block/Payment/Info/BilletCreditCard.php b/Block/Payment/Info/BilletCreditCard.php
index d6cefa27..bba58335 100644
--- a/Block/Payment/Info/BilletCreditCard.php
+++ b/Block/Payment/Info/BilletCreditCard.php
@@ -175,7 +175,7 @@ public function getTransactionInfo()
             if ($item->getAcquirerNsu() != 0) {
                 $transactionList['creditCard'] =
                     array_merge(
-                        $orderObject->getCharges()[0]->getAcquirerTidCapturedAndAutorize(),
+                        $orderObject->getCharges()[0]->getAcquirerTidCapturedAndAuthorize(),
                         ['tid' => $this->getTid($orderObject->getCharges()[0])]
                     );
 
diff --git a/Block/Payment/Info/CreditCard.php b/Block/Payment/Info/CreditCard.php
index 8a79027e..370e536f 100644
--- a/Block/Payment/Info/CreditCard.php
+++ b/Block/Payment/Info/CreditCard.php
@@ -11,20 +11,12 @@
 
 namespace Pagarme\Pagarme\Block\Payment\Info;
 
-use Exception;
-use Magento\Framework\Exception\LocalizedException;
-use Magento\Payment\Block\Info\Cc;
-use Pagarme\Core\Kernel\Aggregates\Charge;
-use Pagarme\Core\Kernel\Exceptions\InvalidParamException;
-use Pagarme\Core\Kernel\Services\OrderService;
-use Pagarme\Core\Kernel\ValueObjects\Id\OrderId;
+use Pagarme\Pagarme\Block\Payment\Info\BaseCardInfo;
 use Pagarme\Core\Payment\Aggregates\Payments\Authentication\AuthenticationStatusEnum;
-use Pagarme\Pagarme\Concrete\Magento2CoreSetup;
-use Pagarme\Pagarme\Concrete\Magento2PlatformOrderDecorator;
 
-class CreditCard extends Cc
+class CreditCard extends BaseCardInfo
 {
-    const TEMPLATE = 'Pagarme_Pagarme::info/creditCard.phtml';
+    const TEMPLATE = 'Pagarme_Pagarme::info/card.phtml';
 
     /**
      * @return void
@@ -42,22 +34,6 @@ public function getCcType()
         return $this->getCcTypeName();
     }
 
-    /**
-     * @return string
-     */
-    public function getCardLast4()
-    {
-        return '**** **** **** ' . $this->getInfo()->getAdditionalInformation('cc_last_4');
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCcBrand()
-    {
-        return $this->getInfo()->getAdditionalInformation('cc_type');
-    }
-
     /**
      * @return mixed
      */
@@ -66,14 +42,6 @@ public function getTitle()
         return $this->getInfo()->getAdditionalInformation('method_title');
     }
 
-    /**
-     * @return mixed
-     */
-    public function getInstallments()
-    {
-        return $this->getInfo()->getAdditionalInformation('cc_installments');
-    }
-
     public function getThreeDSStatus()
     {
         $authenticationAdditionalInformation = $this->getInfo()->getAdditionalInformation('authentication');
@@ -86,76 +54,4 @@ public function getThreeDSStatus()
             $authentication['trans_status'] ?? ''
         );
     }
-
-    /**
-     * @return array
-     * @throws InvalidParamException
-     * @throws LocalizedException
-     * @throws Exception
-     */
-    public function getTransactionInfo()
-    {
-        Magento2CoreSetup::bootstrap();
-        $orderService = new OrderService();
-
-        $orderEntityId = $this->getInfo()->getOrder()->getIncrementId();
-        $platformOrder = $this->loadPlatformOrderByIncrementId($orderEntityId);
-
-        $orderPagarmeId = $platformOrder->getPagarmeId();
-
-        if ($orderPagarmeId === null) {
-            return [];
-        }
-
-        $orderObject = $this->getOrderObjectByPagarmeId($orderService, $orderPagarmeId);
-
-        if ($orderObject === null || !is_object($orderObject)) {
-            return [];
-        }
-
-        $charge = current($orderObject->getCharges());
-
-        return array_merge(
-            $charge->getAcquirerTidCapturedAndAutorize(),
-            ['tid' => $this->getTid($charge)]
-        );
-    }
-
-    /**
-     * @param mixed $incrementId
-     * @return Magento2PlatformOrderDecorator
-     */
-    private function loadPlatformOrderByIncrementId($incrementId)
-    {
-        $platformOrder = new Magento2PlatformOrderDecorator();
-        $platformOrder->loadByIncrementId($incrementId);
-        return $platformOrder;
-    }
-
-    /**
-     * @param mixed $orderService
-     * @param mixed $pagarmeId
-     * @return mixed
-     */
-    private function getOrderObjectByPagarmeId($orderService, $pagarmeId)
-    {
-        $orderId = new OrderId($pagarmeId);
-        return $orderService->getOrderByPagarmeId($orderId);
-    }
-
-    /**
-     * @param \Pagarme\Core\Kernel\Aggregates\Charge $charge
-     * @return string|null
-     */
-    private function getTid(Charge $charge)
-    {
-        $transaction = $charge->getLastTransaction();
-
-        $tid = null;
-        if ($transaction !== null) {
-            $tid = $transaction->getAcquirerTid();
-        }
-
-        return $tid;
-    }
 }
diff --git a/Block/Payment/Info/Debit.php b/Block/Payment/Info/Debit.php
index 81b52f39..113768c5 100644
--- a/Block/Payment/Info/Debit.php
+++ b/Block/Payment/Info/Debit.php
@@ -2,7 +2,21 @@
 
 namespace Pagarme\Pagarme\Block\Payment\Info;
 
-class Debit extends CreditCard
+use Pagarme\Pagarme\Block\Payment\Info\BaseCardInfo;
+
+class Debit extends BaseCardInfo
 {
+    const TEMPLATE = 'Pagarme_Pagarme::info/card.phtml';
 
+    public function _construct()
+    {
+        $this->setTemplate(self::TEMPLATE);
+    }
+    /**
+     * @return mixed
+     */
+    public function getTitle()
+    {
+        return $this->getInfo()->getAdditionalInformation('method_title');
+    }
 }
diff --git a/Block/Payment/Info/GooglePay.php b/Block/Payment/Info/GooglePay.php
new file mode 100644
index 00000000..4dbf9218
--- /dev/null
+++ b/Block/Payment/Info/GooglePay.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Pagarme\Pagarme\Block\Payment\Info;
+
+use Pagarme\Pagarme\Block\Payment\Info\BaseCardInfo;
+
+class GooglePay extends BaseCardInfo
+{
+    const TEMPLATE = 'Pagarme_Pagarme::info/card.phtml';
+    
+    public function getTitle()
+    {
+        return "Google Pay";
+    }
+    public function _construct()
+    {
+        $this->setTemplate(self::TEMPLATE);
+    }
+}
diff --git a/Block/Payment/Info/TwoCreditCard.php b/Block/Payment/Info/TwoCreditCard.php
index 5474f959..a2b94dd4 100644
--- a/Block/Payment/Info/TwoCreditCard.php
+++ b/Block/Payment/Info/TwoCreditCard.php
@@ -159,11 +159,11 @@ public function getTransactionInfo()
 
         return [
             'card1' => array_merge(
-                $chargeOne->getAcquirerTidCapturedAndAutorize(),
+                $chargeOne->getAcquirerTidCapturedAndAuthorize(),
                 ['tid' => $this->getTid($chargeOne)]
             ),
             'card2' => array_merge(
-                $chargeTwo->getAcquirerTidCapturedAndAutorize(),
+                $chargeTwo->getAcquirerTidCapturedAndAuthorize(),
                 ['tid' => $this->getTid($chargeTwo)]
             )
         ];
diff --git a/Block/Payment/Info/Voucher.php b/Block/Payment/Info/Voucher.php
index 1eb361c4..f45d675a 100644
--- a/Block/Payment/Info/Voucher.php
+++ b/Block/Payment/Info/Voucher.php
@@ -2,9 +2,9 @@
 
 namespace Pagarme\Pagarme\Block\Payment\Info;
 
-use Magento\Payment\Block\Info\Cc;
+use Pagarme\Pagarme\Block\Payment\Info\BaseCardInfo;
 
-class Voucher extends Cc
+class Voucher extends BaseCardInfo
 {
 
 }
diff --git a/Concrete/Magento2CoreSetup.php b/Concrete/Magento2CoreSetup.php
index f44eda85..a61ec500 100644
--- a/Concrete/Magento2CoreSetup.php
+++ b/Concrete/Magento2CoreSetup.php
@@ -143,20 +143,21 @@ public function loadModuleConfigurationFromPlatform($storeConfig = null)
                 return;
             }
 
-        self::fillWithGeneralConfig($configData, $storeConfig);
-        self::fillWithPagarmeKeys($configData, $storeConfig);
-        self::fillWithCardConfig($configData, $storeConfig);
-        self::fillWithBoletoConfig($configData, $storeConfig);
-        self::fillWithPixConfig($configData, $storeConfig);
-        self::fillWithBoletoCreditCardConfig($configData, $storeConfig);
-        self::fillWithTwoCreditCardsConfig($configData, $storeConfig);
-        self::fillWithVoucherConfig($configData, $storeConfig);
-        self::fillWithDebitConfig($configData, $storeConfig);
-        self::fillWithAddressConfig($configData, $storeConfig);
-        self::fillWithMultiBuyerConfig($configData, $storeConfig);
-        self::fillWithRecurrenceConfig($configData, $storeConfig);
-        self::fillWithHubConfig($configData, $storeConfig);
-        self::fillWithMarketplaceConfig($configData, $storeConfig);
+            self::fillWithGeneralConfig($configData, $storeConfig);
+            self::fillWithPagarmeKeys($configData, $storeConfig);
+            self::fillWithCardConfig($configData, $storeConfig);
+            self::fillWithBoletoConfig($configData, $storeConfig);
+            self::fillWithPixConfig($configData, $storeConfig);
+            self::fillWithGooglePayConfig($configData, $storeConfig);
+            self::fillWithBoletoCreditCardConfig($configData, $storeConfig);
+            self::fillWithTwoCreditCardsConfig($configData, $storeConfig);
+            self::fillWithVoucherConfig($configData, $storeConfig);
+            self::fillWithDebitConfig($configData, $storeConfig);
+            self::fillWithAddressConfig($configData, $storeConfig);
+            self::fillWithMultiBuyerConfig($configData, $storeConfig);
+            self::fillWithRecurrenceConfig($configData, $storeConfig);
+            self::fillWithHubConfig($configData, $storeConfig);
+            self::fillWithMarketplaceConfig($configData, $storeConfig);
 
             $configurationFactory = new ConfigurationFactory();
             $config = $configurationFactory->createFromJsonData(
@@ -294,6 +295,24 @@ private static function fillWithPixConfig(
 
         $configData->pixConfig = self::fillDataObj($storeConfig, $options, $pixObject, $section);
     }
+    
+    private static function fillWithGooglePayConfig(
+        stdClass $configData,
+        ScopeConfigInterface $storeConfig
+    ) {
+        $options = [
+            'enabled' => 'active',
+            'title' => 'title',
+            'merchantId' => 'merchant_id',
+            'merchantName' => 'merchant_name'
+        ];
+
+        $section = 'payment/pagarme_googlepay/';
+
+        $googlePayObject = new \stdClass();
+
+        $configData->googlePayConfig = self::fillDataObj($storeConfig, $options, $googlePayObject, $section);
+    }
 
 
     static private function fillWithBoletoConfig(&$dataObj, $storeConfig)
diff --git a/Concrete/Magento2PlatformOrderDecorator.php b/Concrete/Magento2PlatformOrderDecorator.php
index 6db33ffb..cc079c1e 100644
--- a/Concrete/Magento2PlatformOrderDecorator.php
+++ b/Concrete/Magento2PlatformOrderDecorator.php
@@ -30,6 +30,7 @@
 use Pagarme\Core\Payment\Aggregates\Payments\NewDebitCardPayment;
 use Pagarme\Core\Payment\Aggregates\Payments\NewVoucherPayment;
 use Pagarme\Core\Payment\Aggregates\Payments\PixPayment;
+use Pagarme\Core\Payment\Aggregates\Payments\GooglePayPayment;
 use Pagarme\Core\Payment\Aggregates\Shipping;
 use Pagarme\Core\Payment\Factories\PaymentFactory;
 use Pagarme\Core\Payment\Repositories\CustomerRepository as CoreCustomerRepository;
@@ -126,7 +127,8 @@ public function getState()
     public function setStatusAfterLog(OrderStatus $status)
     {
         $stringStatus = $status->getStatus();
-        $this->platformOrder->setStatus($stringStatus);
+        $stringMagentoStatus = $this->getMagentoStatusFromCoreStatus($stringStatus);
+        $this->platformOrder->setStatus($stringMagentoStatus);
     }
 
     public function getStatus()
@@ -1194,6 +1196,25 @@ private function extractPaymentDataFromPagarmePix(
         $paymentData[$pixDataIndex][] = $newPaymentData;
     }
 
+    private function extractPaymentDataFromPagarmeGooglepay(
+        $additionalInformation,
+        &$paymentData,
+        $payment
+    ) {
+        $newPaymentData = new stdClass();
+        $newPaymentData->amount =
+            $this->moneyService->floatToCents($this->platformOrder->getGrandTotal());
+        $newPaymentData->googlepayData = $additionalInformation['googlepayData'];
+        $newPaymentData->additionalInformation = ["googlepayData" => $additionalInformation['googlepayData']];
+        $googlepayIndex = 'googlepay';
+        if (!isset($paymentData[$googlepayIndex])) {
+            $paymentData[$googlepayIndex] = [];
+        }
+
+        $paymentData[$googlepayIndex][] = $newPaymentData;
+    }
+
+    
     public function getShipping()
     {
         /** @var Shipping $shipping */
@@ -1336,4 +1357,18 @@ public function handleSplitOrder()
 
         return $splitData;
     }
+
+    /**
+     * @param string|null $coreStatus
+     * @return string|null
+     */
+    private function getMagentoStatusFromCoreStatus($coreStatus)
+    {
+        $coreToMagentoStatus = [
+            'failed' => 'canceled'
+        ];
+
+        return array_key_exists($coreStatus, $coreToMagentoStatus) ?
+            $coreToMagentoStatus[$coreStatus] : $coreStatus;
+    }
 }
diff --git a/Concrete/Magento2PlatformPaymentMethodDecorator.php b/Concrete/Magento2PlatformPaymentMethodDecorator.php
index e9d5c92e..fa652e12 100644
--- a/Concrete/Magento2PlatformPaymentMethodDecorator.php
+++ b/Concrete/Magento2PlatformPaymentMethodDecorator.php
@@ -11,6 +11,7 @@ class Magento2PlatformPaymentMethodDecorator implements PlatformPaymentMethodInt
     const VOUCHER = 'voucher';
     const DEBIT = "debit";
     const PIX = "pix";
+    const GOOGLEPAY = "googlepay";
 
     private $paymentMethod;
 
@@ -79,4 +80,9 @@ private function pix()
     {
         return self::PIX;
     }
+    
+    private function googlepay()
+    {
+        return self::GOOGLEPAY;
+    }
 }
diff --git a/Controller/Adminhtml/Recipients/Create.php b/Controller/Adminhtml/Recipients/Create.php
index 81ace41b..a2fbf44f 100644
--- a/Controller/Adminhtml/Recipients/Create.php
+++ b/Controller/Adminhtml/Recipients/Create.php
@@ -2,11 +2,7 @@
 
 namespace Pagarme\Pagarme\Controller\Adminhtml\Recipients;
 
-use Magento\Framework\Registry;
 use Magento\Framework\Controller\ResultInterface;
-use Pagarme\Core\Marketplace\Services\RecipientService;
-use Webkul\Marketplace\Model\SellerFactory;
-use Pagarme\Pagarme\Controller\Adminhtml\Recipients\RecipientAction;
 
 class Create extends RecipientAction
 {
@@ -17,32 +13,43 @@ class Create extends RecipientAction
      */
     public function execute()
     {
+
         $sellers = $this->sellerFactory->create()->getCollection()->load();
         $sellers = $sellers->getItems();
-
         $this->coreRegistry->register('sellers', serialize($sellers));
 
         $recipientId = (int)$this->getRequest()->getParam('id');
         if ($recipientId) {
-
-            $recipientService = new RecipientService();
-            $recipient = $recipientService->findById($recipientId);
-            $externalId = $recipient->getExternalId();
-            $localId = $recipient->getId();
-            $recipient = $recipientService->findByPagarmeId($recipient->getPagarmeId());
-
+            $this->resourceModelRecipient->load($this->recipient, $recipientId);
+            $recipient = $this->recipientService->searchRecipient($this->recipient->getPagarmeId());
+            $statusUpdated = false;
+            if ($this->recipient->getStatus() !== $recipient->status) {
+                $this->recipient->setStatus($recipient->status);
+                $this->resourceModelRecipient->save($this->recipient);
+                $statusUpdated = true;
+            }
             if (!$recipient || !$recipient->id) {
                 $this->messageManager->addError(__('Recipient not exist.'));
                 $this->_redirect('pagarme_pagarme/recipients/index');
                 return;
             }
 
-            $this->coreRegistry->register('recipient_data', json_encode(['recipient' => $recipient, 'externalId' => $externalId, 'localId' => $localId]));
+
+            $this->coreRegistry->register(
+                'recipient_data',
+                json_encode([
+                    'recipient' => $recipient,
+                    'externalId' => $recipient->code,
+                    'localId' => $recipientId,
+                    'status' => $this->recipient->getStatus(),
+                    'statusUpdated' => $statusUpdated
+                ])
+            );
         }
 
         $resultPage = $this->resultPageFactory->create();
 
-        $title = $recipientId ? __('Edit Recipient') : __('Create Recipient');
+        $title = $recipientId ? __('Recipient') : __('Create Recipient');
 
         $resultPage->getConfig()->getTitle()->prepend($title);
 
diff --git a/Controller/Adminhtml/Recipients/Delete.php b/Controller/Adminhtml/Recipients/Delete.php
index dfcb079d..a07ee049 100644
--- a/Controller/Adminhtml/Recipients/Delete.php
+++ b/Controller/Adminhtml/Recipients/Delete.php
@@ -32,7 +32,7 @@ public function execute()
 
         $recipientService->delete($recipientId);
 
-        $message = $this->messageFactory->create('success', _("Recipient deleted."));
+        $message = $this->messageFactory->create('success', __("Recipient deleted."));
         $this->messageManager->addMessage($message);
 
         $this->_redirect('pagarme_pagarme/recipients/index');
diff --git a/Controller/Adminhtml/Recipients/RecipientAction.php b/Controller/Adminhtml/Recipients/RecipientAction.php
index 49a1816f..e1bbc893 100644
--- a/Controller/Adminhtml/Recipients/RecipientAction.php
+++ b/Controller/Adminhtml/Recipients/RecipientAction.php
@@ -4,14 +4,16 @@
 
 use Exception;
 use Magento\Backend\App\Action;
-use Magento\Backend\App\Action\Context;
 use Magento\Framework\Registry;
+use Pagarme\Pagarme\Model\Recipient;
+use Magento\Backend\App\Action\Context;
+use Webkul\Marketplace\Model\SellerFactory;
 use Magento\Framework\View\Result\PageFactory;
 use Pagarme\Pagarme\Concrete\Magento2CoreSetup;
-use Webkul\Marketplace\Model\SellerFactory;
-use Magento\Framework\Message\Factory as MagentoMessageFactory;
 use Magento\Framework\Module\Manager as ModuleManager;
-
+use Pagarme\Pagarme\Service\Marketplace\RecipientService;
+use Magento\Framework\Message\Factory as MagentoMessageFactory;
+use Pagarme\Pagarme\Model\ResourceModel\Recipients as ResourceModelRecipient;
 
 class RecipientAction extends Action
 {
@@ -36,6 +38,21 @@ class RecipientAction extends Action
      * @var ModuleManager
      */
     private $moduleManager;
+    /**
+     *
+     * @var \Pagarme\Pagarme\Model\ResourceModel\Recipients
+     */
+    protected $resourceModelRecipient;
+    /**
+     *
+     * @var \Pagarme\Pagarme\Model\Recipient
+     */
+    protected $recipient;
+    /**
+     *
+     * @var \Pagarme\Pagarme\Service\Marketplace\RecipientService
+     */
+    protected $recipientService;
 
     /**
      * @param Context $context
@@ -43,6 +60,9 @@ class RecipientAction extends Action
      * @param PageFactory $resultPageFactory
      * @param MagentoMessageFactory $messageFactory
      * @param ModuleManager $moduleManager
+     * @param ResourceModelRecipient $resourceModelRecipient
+     * @param Recipient $recipient
+     * @param RecipientService $recipientService
      * @throws Exception
      */
     public function __construct(
@@ -50,7 +70,10 @@ public function __construct(
         Registry $coreRegistry,
         PageFactory $resultPageFactory,
         MagentoMessageFactory $messageFactory,
-        ModuleManager $moduleManager
+        ModuleManager $moduleManager,
+        ResourceModelRecipient $resourceModelRecipient,
+        Recipient $recipient,
+        RecipientService $recipientService
     ) {
 
         parent::__construct($context);
@@ -59,7 +82,11 @@ public function __construct(
         $this->coreRegistry = $coreRegistry;
         $this->messageFactory = $messageFactory;
         $this->moduleManager = $moduleManager;
+        $this->resourceModelRecipient = $resourceModelRecipient;
+        $this->recipient = $recipient;
+        $this->recipientService = $recipientService;
         $this->__init();
+        
         Magento2CoreSetup::bootstrap();
     }
 
diff --git a/Gateway/Transaction/GooglePay/Config/Config.php b/Gateway/Transaction/GooglePay/Config/Config.php
new file mode 100755
index 00000000..f941f911
--- /dev/null
+++ b/Gateway/Transaction/GooglePay/Config/Config.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Class Config
+ *
+ * @author      Open Source Team
+ * @copyright   2024 Pagar.me (https://pagar.me)
+ * @license     https://pagar.me Copyright
+ *
+ * @link        https://pagar.me
+ */
+
+namespace Pagarme\Pagarme\Gateway\Transaction\GooglePay\Config;
+
+
+use Pagarme\Pagarme\Gateway\Transaction\Base\Config\AbstractConfig;
+
+class Config extends AbstractConfig implements ConfigInterface
+{
+    /**
+     * @return string
+     */
+    public function getTitle()
+    {
+        $title = $this->getConfig(static::PATH_TITLE);
+
+        if (empty($title)) {
+            return __('Pagar.me Google Pay');
+        }
+
+        return $title;
+    }
+
+    /**
+     * Return Google ID
+     * @return string
+     */
+    public function getMerchantId()
+    {
+        return $this->getConfig(static::MERCHANT_ID);
+    }
+
+    /**
+     * Return Merchant Name
+     * @return string
+     */
+    public function getMerchantName()
+    {
+        return $this->getConfig(static::MERCHANT_NAME);
+    }
+
+    /**
+     * Return Cards Brands
+     * @return array
+     */
+    public function getCardBrands()
+    {
+        $brandsAllowed = [];
+        $creditCardBrandsSelected = explode(',', $this->getConfig(static::CARD_BRANDS));
+        foreach ($creditCardBrandsSelected as $brand) {
+            if (in_array(strtoupper($brand), static::GOOGLE_POSSIBLE_BRANDS)) {
+                $brandsAllowed[] = strtoupper($brand);
+            }
+        }
+        return $brandsAllowed;
+    }
+}
diff --git a/Gateway/Transaction/GooglePay/Config/ConfigInterface.php b/Gateway/Transaction/GooglePay/Config/ConfigInterface.php
new file mode 100755
index 00000000..c358f637
--- /dev/null
+++ b/Gateway/Transaction/GooglePay/Config/ConfigInterface.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Class ConfigInterface
+ *
+ * @author      Open Source Team
+ * @copyright   2024 Pagar.me (https://pagar.me)
+ * @license     https://pagar.me Copyright
+ *
+ * @link        https://pagar.me
+ */
+
+namespace Pagarme\Pagarme\Gateway\Transaction\GooglePay\Config;
+
+
+interface ConfigInterface
+{
+    const PATH_TITLE                = 'payment/pagarme_googlepay/title';
+    const MERCHANT_ID               = 'payment/pagarme_googlepay/merchant_id';
+    const MERCHANT_NAME             = 'payment/pagarme_googlepay/merchant_name';
+    const CARD_BRANDS               = 'payment/pagarme_creditcard/cctypes';
+    /**
+     * Possible brands by google
+     * @see https://developers.google.com/pay/api/web/reference/request-objects#CardParameters
+     */
+    const GOOGLE_POSSIBLE_BRANDS = ['VISA', 'ELECTRON', 'MASTERCARD', 'MAESTRO', 'ELO'];
+    /**
+     * @return string
+     */
+    public function getTitle();
+    public function getMerchantId();
+    public function getMerchantName();
+    public function getCardBrands();
+
+}
diff --git a/Gateway/Transaction/GooglePay/Create/RequestDataProvider.php b/Gateway/Transaction/GooglePay/Create/RequestDataProvider.php
new file mode 100644
index 00000000..edb58a3f
--- /dev/null
+++ b/Gateway/Transaction/GooglePay/Create/RequestDataProvider.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Class RequestDataProvider
+ *
+ * @author      Open Source Team
+ * @copyright   2024 Pagar.me (https://pagar.me)
+ * @license     https://pagar.me Copyright
+ *
+ * @link        https://pagar.me
+ */
+
+namespace Pagarme\Pagarme\Gateway\Transaction\GooglePay\ResourceGateway\Create;
+
+
+use Magento\Checkout\Model\Session;
+use Magento\Payment\Gateway\Data\OrderAdapterInterface;
+use Magento\Payment\Model\InfoInterface;
+use Pagarme\Pagarme\Gateway\Transaction\Base\Config\ConfigInterface;
+use Pagarme\Pagarme\Helper\CustomerAddressInterface;
+use Pagarme\Pagarme\Gateway\Transaction\Base\ResourceGateway\AbstractAddressDataProvider;
+
+class RequestDataProvider extends AbstractAddressDataProvider
+{
+    /**
+     * @var ConfigInterface
+     */
+    protected $config;
+
+    public function __construct (
+        OrderAdapterInterface $orderAdapter,
+        InfoInterface $payment,
+        Session $session,
+        CustomerAddressInterface $customerAddressHelper,
+        ConfigInterface $config
+    )
+    {
+        parent::__construct($orderAdapter, $payment, $session, $customerAddressHelper);
+        $this->setConfig($config);
+    }
+
+    /**
+     * @return ConfigInterface
+     */
+    protected function getConfig()
+    {
+        return $this->config;
+    }
+
+    /**
+     * @param ConfigInterface $config
+     * @return $this
+     */
+    protected function setConfig($config)
+    {
+        $this->config = $config;
+        return $this;
+    }
+
+}
diff --git a/Gateway/Transaction/GooglePay/Create/Response/Validator.php b/Gateway/Transaction/GooglePay/Create/Response/Validator.php
new file mode 100644
index 00000000..4b51be10
--- /dev/null
+++ b/Gateway/Transaction/GooglePay/Create/Response/Validator.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Class Validator
+ *
+* @author      Open Source Team
+ * @copyright   2024 Pagar.me (https://pagar.me)
+ * @license     https://pagar.me Copyright
+ *
+ * @link        https://pagar.me
+ */
+
+namespace Pagarme\Pagarme\Gateway\Transaction\GooglePay\ResourceGateway\Create\Response;
+
+
+use Magento\Payment\Gateway\Validator\ValidatorInterface;
+use Pagarme\Pagarme\Gateway\Transaction\Base\ResourceGateway\Response\AbstractValidator;
+
+class Validator extends AbstractValidator implements ValidatorInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function validate(array $validationSubject)
+    {
+        if (!isset($validationSubject['response'])) {
+            throw new \InvalidArgumentException('Pagar.me Response object should be provided');
+        }
+
+        $isValid = true;
+        $fails = [];
+
+        return $this->createResult($isValid, $fails);
+    }
+}
diff --git a/Helper/BuildChargeAddtionalInformationHelper.php b/Helper/BuildChargeAddtionalInformationHelper.php
index 60394951..b48d1a25 100644
--- a/Helper/BuildChargeAddtionalInformationHelper.php
+++ b/Helper/BuildChargeAddtionalInformationHelper.php
@@ -55,7 +55,7 @@ function (Transaction $transaction) {
 
             if (empty($billetTransaction)) {
                 $acquirerNsuCapturedAndAutorize =
-                    $charge->getAcquirerTidCapturedAndAutorize();
+                    $charge->getAcquirerTidCapturedAndAuthorize();
 
                 $chargeInformation[$key]["cc_tid"] =
                     $charge->getLastTransaction()->getAcquirerTid();
@@ -92,7 +92,7 @@ private static function buildTwoCreditcard(array $charges)
             $name = $nameForTwoCards[$key];
 
             $acquirerNsuCapturedAndAutorize =
-                $charge->getAcquirerTidCapturedAndAutorize();
+                $charge->getAcquirerTidCapturedAndAuthorize();
 
             $chargeInformation[$key]["cc_tid{$name}"] =
                 $charge->getLastTransaction()->getAcquirerTid();
@@ -116,7 +116,7 @@ private static function buildCreditcard(array $charges)
         $chargeInformation = [];
         foreach ($charges as $key => $charge) {
             $acquirerNsuCapturedAndAutorize =
-                $charge->getAcquirerTidCapturedAndAutorize();
+                $charge->getAcquirerTidCapturedAndAuthorize();
 
             $chargeInformation[$key]["cc_tid"] =
                 $charge->getLastTransaction()->getAcquirerTid();
diff --git a/Model/Api/KycLinkResponse.php b/Model/Api/KycLinkResponse.php
new file mode 100644
index 00000000..7c7cedc2
--- /dev/null
+++ b/Model/Api/KycLinkResponse.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Pagarme\Pagarme\Model\Api;
+
+use Magento\Framework\DataObject;
+use Pagarme\Pagarme\Api\KycLinkResponseInterface;
+
+class KycLinkResponse extends DataObject implements KycLinkResponseInterface
+{
+    public function getUrl()
+    {
+        return $this->_getData(self::DATA_URL);
+    }
+
+    public function getQrCode()
+    {
+        return $this->_getData(self::DATA_QR_CODE);
+    }
+
+    public function setUrl(string $url)
+    {
+        return $this->setData(self::DATA_URL, $url);
+    }
+
+    public function setQrCode(string $qrCode)
+    {
+        return $this->setData(self::DATA_QR_CODE, $qrCode);
+    }
+}
\ No newline at end of file
diff --git a/Model/Api/Recipient.php b/Model/Api/Recipient.php
index f681ef86..9a232ad0 100644
--- a/Model/Api/Recipient.php
+++ b/Model/Api/Recipient.php
@@ -2,12 +2,19 @@
 
 namespace Pagarme\Pagarme\Model\Api;
 
+use Exception;
+use InvalidArgumentException;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Webapi\Rest\Request;
-use Pagarme\Core\Kernel\ValueObjects\Id\RecipientId;
-use Pagarme\Core\Marketplace\Services\RecipientService;
-use Pagarme\Core\Recurrence\Services\PlanService;
+use Pagarme\Core\Kernel\Services\LogService;
+use Pagarme\Core\Marketplace\Interfaces\RecipientInterface as CoreRecipientInterface;
+use Pagarme\Core\Middle\Factory\RecipientFactory as CoreRecipient;
+use Pagarme\Pagarme\Api\KycLinkResponseInterfaceFactory;
 use Pagarme\Pagarme\Api\RecipientInterface;
-use Pagarme\Pagarme\Concrete\Magento2CoreSetup;
+use Pagarme\Pagarme\Model\RecipientFactory as ModelFactoryRecipient;
+use Pagarme\Pagarme\Model\ResourceModel\Recipients as ResourceModelRecipient;
+use Pagarme\Pagarme\Service\Marketplace\RecipientService;
+use Throwable;
 
 class Recipient implements RecipientInterface
 {
@@ -16,94 +23,163 @@ class Recipient implements RecipientInterface
      */
     protected $request;
 
+    /**
+     * @var ModelFactoryRecipient
+     */
+    protected $modelFactoryRecipient;
+
+    /**
+     * @var ResourceModelRecipient
+     */
+    protected $resourceModelRecipient;
+
+    /**
+     * @var CoreRecipient
+     */
+    protected $coreRecipient;
+
     /**
      * @var RecipientService
      */
     protected $recipientService;
 
-    public function __construct(Request $request)
-    {
-        Magento2CoreSetup::bootstrap();
+    /**
+     * @var KycLinkResponseInterfaceFactory
+     */
+    protected $kycLinkResponseFactory;
+
+    public function __construct(
+        Request $request,
+        ModelFactoryRecipient $modelFactoryRecipient,
+        ResourceModelRecipient $resourceModelRecipient,
+        CoreRecipient $coreRecipient,
+        RecipientService $recipientService,
+        KycLinkResponseInterfaceFactory $kycLinkResponseFactory
+    ) {
         $this->request = $request;
-        $this->recipientService = new RecipientService();
+        $this->modelFactoryRecipient = $modelFactoryRecipient;
+        $this->resourceModelRecipient = $resourceModelRecipient;
+        $this->coreRecipient = $coreRecipient;
+        $this->recipientService = $recipientService;
+        $this->kycLinkResponseFactory = $kycLinkResponseFactory;
     }
 
     /**
      * @return mixed
+     * @throws Exception
      */
     public function saveFormData(): string
     {
-        $post = $this->request->getBodyParams();
-        parse_str($post[0], $params);
+        $bodyParams = current($this->request->getBodyParams());
+        parse_str($bodyParams, $params);
+        $params = $params['form'];
 
-        $form = $this->getFormattedForm($params['form']);
+        try {
+            $message = __(
+                "<p>He can now sell, but remember to check his "
+                . "<b>status</b>. He can only withdraw his sales amounts once the status is "
+                . "<i>“active”</i></p>"
+            );
+
+            if (empty($params['pagarme_id'])) {
+                $recipientOnPagarme = $this->createOnPagarme($params);
+                $params['pagarme_id'] = $recipientOnPagarme->id;
+                $params['status'] = CoreRecipientInterface::REGISTERED;
+                $message = __(
+                    "<p>Follow the status on <b>Pagar.me > Recipients</b> to activate"
+                    . " this recipient's balance movement soon!</p>"
+                );
+            }
+            $this->saveOnPlatform($params);
 
-        if (empty($form)) {
             return json_encode([
-                'code' => 400,
-                'message' => 'Error on save recipient'
+                'code' => 200,
+                'message' => $message
             ]);
-        }
+        } catch (Throwable $th) {
+            $logService = new LogService("Recipient Log", true, 1);
+            $logService->info($th->getMessage(), [
+                'webkul_seller' => $params['register_information']['webkul_seller'],
+                'document' => $params['register_information']['document'],
+                'external_id' => $params['register_information']['external_id']
 
-        try {
-            $this->recipientService->saveFormRecipient($form);
-        } catch (\Exception $exception) {
+            ]);
             return json_encode([
                 'code' => 400,
-                'message' => $exception->getMessage()
+                'message' => __('An error occurred while saving the recipient.')
+                    . ' ' . __($th->getMessage())
             ]);
         }
-
-        return json_encode([
-            'code' => 200,
-            'message' => 'Recipient saved'
-        ]);
     }
 
-    public function getFormattedForm(array $form): array
+    /**
+     * @throws Exception
+     */
+    private function saveOnPlatform($params)
     {
-        $form['holder_document'] = preg_replace("/[^0-9]/", "", $form['holder_document'] ?? '');
-        $form['document']  = preg_replace("/[^0-9]/", "", $form['document'] ?? '');
-        if (isset($form['type'])) {
-            $form['holder_type'] = $form['type'];
-        }
-        if (isset($form['pagarme_id'])) {
-            $form['recipient_id'] = $form['pagarme_id'];
-        }
+        $registeredInformation = $params['register_information'];
+        $recipientModel = $this->modelFactoryRecipient->create();
+        $recipientModel->setId(null);
+        $recipientModel->setExternalId($registeredInformation['external_id']);
+        $recipientModel->setName(empty($registeredInformation['name']) ? $registeredInformation['company_name'] : $registeredInformation['name']);
+        $recipientModel->setEmail($registeredInformation['email']);
+        $recipientModel->setDocument($registeredInformation['document']);
+        $recipientModel->setPagarmeId($params['pagarme_id']);
+        $recipientModel->setType($registeredInformation['type']);
+        $recipientModel->setStatus($params['status']);
+        $this->resourceModelRecipient->save($recipientModel);
+    }
 
-        return $form;
+    /**
+     * @param $recipientData
+     * @return mixed
+     */
+    private function createOnPagarme($recipientData)
+    {
+        $coreRecipient = $this->coreRecipient->createRecipient($recipientData);
+        return $this->recipientService->createRecipient($coreRecipient);
     }
 
+    /**
+     * @return string
+     */
     public function searchRecipient(): string
     {
         $post = $this->request->getBodyParams();
 
         try {
-            $recipientId = new RecipientId($post['recipientId']);
-        } catch (\Exception $e) {
-            return json_encode([
-                'code' => 400,
-                'message' => 'Invalid Pagar.me ID'
-            ]);
-        }
-
-        try {
-            $recipient = $this->recipientService->findByPagarmeId($recipientId);
-
-            if ($recipient->status != 'active') {
-                throw new \Exception('Recipient not active');
+            $recipient = $this->recipientService->searchRecipient($post['recipientId']);
+            if ($recipient->status !== 'active') {
+                throw new InvalidArgumentException(__('Recipient not active.'));
             }
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return json_encode([
                 'code' => 404,
-                'message' => $e->getMessage(),
+                'message' => __($e->getMessage()),
             ]);
         }
 
         return json_encode([
             'code' => 200,
-            'message' => 'Recipient finded',
+            'message' => __('Recipient found.'),
             'recipient' => $recipient,
         ]);
     }
+
+    public function createKycLink(string $id)
+    {
+        $recipientModel = $this->modelFactoryRecipient->create();
+        $this->resourceModelRecipient->load($recipientModel, $id);
+        if (empty($recipientModel->getPagarmeId())) {
+            throw new NoSuchEntityException(__('Recipient not founded.'));
+        }
+        $kycLink = $this->recipientService->createKycLink($recipientModel->getPagarmeId());
+        if (empty($kycLink->url) || empty($kycLink->base64_qrcode)) {
+            throw new NoSuchEntityException(__('Failed to generate the security validation link.'));
+        }
+        $kycResponse = $this->kycLinkResponseFactory->create();
+        $kycResponse->setUrl($kycLink->url)
+            ->setQrCode('data:image/svg+xml;base64,' . $kycLink->base64_qrcode);
+        return $kycResponse;
+    }
 }
diff --git a/Model/PagarmeConfigProvider.php b/Model/PagarmeConfigProvider.php
index 3e177702..38a4b662 100644
--- a/Model/PagarmeConfigProvider.php
+++ b/Model/PagarmeConfigProvider.php
@@ -51,6 +51,7 @@ class PagarmeConfigProvider implements ConfigProviderInterface
     const PATH_VOUCHER_ENABLED = 'payment/pagarme_voucher/active';
 
     const PATH_DEBIT_ENABLED = 'payment/pagarme_debit/active';
+    const PATH_GOOGLEPAY_ENABLED = 'payment/pagarme_googlepay/active';
 
     const PATH_IS_PAYMENT_GATEWAY_TYPE = 'pagarme_pagarme/%s/is_payment_gateway';
 
@@ -63,6 +64,8 @@ class PagarmeConfigProvider implements ConfigProviderInterface
     const DEBIT_PAYMENT_CONFIG = 'pagarme_debit';
 
     const PIX_PAYMENT_CONFIG = 'pagarme_pix';
+    
+    const GOOGLEPAY_PAYMENT_CONFIG = 'pagarme_googlepay';
 
     const VOUCHER_PAYMENT_CONFIG = 'pagarme_voucher';
 
@@ -386,6 +389,17 @@ public function isDebitEnabled($website = null)
             $website
         );
     }
+    /**
+     * @return bool
+     */
+    public function isGooglePayEnabled($website = null)
+    {
+        return (bool) $this->scopeConfig->getValue(
+            self::PATH_GOOGLEPAY_ENABLED,
+            ScopeInterface::SCOPE_WEBSITES,
+            $website
+        );
+    }
 
     /**
      * @param mixed $website
@@ -398,7 +412,8 @@ public function availablePaymentMethods($website = null)
             PaymentEnum::DEBIT_CARD => $this->isDebitEnabled($website),
             PaymentEnum::BILLET => $this->isAnyBilletMethodEnabled($website),
             PaymentEnum::CREDIT_CARD => $this->isAnyCreditCardMethodEnabled($website),
-            PaymentEnum::VOUCHER => $this->isVoucherEnabled($website)
+            PaymentEnum::VOUCHER => $this->isVoucherEnabled($website),
+            PaymentEnum::GOOGLEPAY => $this->isGooglePayEnabled($website)
         ];
     }
 
@@ -410,6 +425,7 @@ public function getConfig(): array
         return [
             'pagarme_is_sandbox_mode' => $this->pagarmeConfig->isSandboxMode(),
             'pagarme_is_hub_enabled' => $this->pagarmeConfig->isHubEnabled(),
+            'pagarme_account_id' => $this->getAccountId(),
             'pagarme_customer_configs' => $this->pagarmeConfig->getPagarmeCustomerConfigs(),
             'pagarme_customer_address_configs' => $this->pagarmeConfig->getPagarmeCustomerAddressConfigs()
         ] ;
diff --git a/Model/Recipient.php b/Model/Recipient.php
index 29f1688a..1e5ce179 100644
--- a/Model/Recipient.php
+++ b/Model/Recipient.php
@@ -2,23 +2,13 @@
 
 namespace Pagarme\Pagarme\Model;
 
-use Magento\Framework\DataObject\IdentityInterface;
 use Magento\Framework\Model\AbstractModel;
 
-class Recipient extends AbstractModel implements IdentityInterface
+class Recipient extends AbstractModel
 {
     protected function _construct()
     {
         $this->_init('Pagarme\Pagarme\Model\ResourceModel\Recipients');
     }
-
-    /**
-     * Return unique ID(s) for each object in system
-     *
-     * @return string[]
-     */
-    public function getIdentities()
-    {
-        return $this->getId();
-    }
+    
 }
diff --git a/Model/ResourceModel/Recipients.php b/Model/ResourceModel/Recipients.php
index 6a764c2e..30aacdf7 100644
--- a/Model/ResourceModel/Recipients.php
+++ b/Model/ResourceModel/Recipients.php
@@ -3,15 +3,10 @@
 namespace Pagarme\Pagarme\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\Model\ResourceModel\Db\Context;
 
 class Recipients extends AbstractDb
 {
-    public function __construct(Context $context)
-    {
-        parent::__construct($context);
-    }
-
+    
     protected function _construct()
     {
         $this->_init('pagarme_module_core_recipients', 'id');
diff --git a/Model/Ui/GooglePay/ConfigProvider.php b/Model/Ui/GooglePay/ConfigProvider.php
new file mode 100644
index 00000000..4c53106c
--- /dev/null
+++ b/Model/Ui/GooglePay/ConfigProvider.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Pagarme\Pagarme\Model\Ui\GooglePay;
+
+use Magento\Checkout\Model\ConfigProviderInterface;
+use Pagarme\Pagarme\Gateway\Transaction\GooglePay\Config\ConfigInterface;
+
+final class ConfigProvider implements ConfigProviderInterface
+{
+    const CODE = 'pagarme_googlepay';
+
+    /**
+     * @var ConfigInterface
+     */
+    private $googlePayConfig;
+
+    public function __construct(
+        ConfigInterface $googlePayConfig
+    )
+    {
+        $this->googlePayConfig = $googlePayConfig;
+    }
+
+    public function getConfig()
+    {
+        return [
+            'payment' => [
+                self::CODE => [
+                    'active' => true,
+                    'title' => $this->googlePayConfig->getTitle(),
+                    'merchantId' => $this->googlePayConfig->getMerchantId(),
+                    'merchantName' => $this->googlePayConfig->getMerchantName(),
+                    'cardBrands' => $this->googlePayConfig->getCardBrands()
+                ]
+            ]
+        ];
+    }
+}
diff --git a/Model/WebhookManagement.php b/Model/WebhookManagement.php
index a1edf9cb..04da88c5 100644
--- a/Model/WebhookManagement.php
+++ b/Model/WebhookManagement.php
@@ -27,13 +27,21 @@ class WebhookManagement implements WebhookManagementInterface
      */
     protected $account;
 
+    /**
+     * @var WebhookReceiverService
+     */
+    protected $webhookReceiverService;
+
     public function __construct(
         OrderFactory $orderFactory,
-        Account $account
+        Account $account,
+        WebhookReceiverService $webhookReceiverService
     ) {
         $this->orderFactory = $orderFactory;
         $this->account = $account;
+        $this->webhookReceiverService = $webhookReceiverService;
     }
+
     /**
      * @api
      * @param mixed $id
@@ -52,7 +60,10 @@ public function save($id, $type, $data, $account)
             $postData->type = $type;
             $postData->data = $data;
 
-            if($this->hasMagentoOrder($data) === false) {
+            if (
+                $this->hasMagentoOrder($data) === false
+                && $this->isNotRecipientWebhook($type)
+            ) {
                 $this->logWebhookIdCaseExistsMetadata($data, $id);
                 return [
                     "message" => "Webhook Received",
@@ -64,14 +75,13 @@ public function save($id, $type, $data, $account)
                 $this->account->saveAccountIdFromWebhook($account);
             }
 
-            $webhookReceiverService = new WebhookReceiverService();
-            return $webhookReceiverService->handle($postData);
+            return $this->webhookReceiverService->handle($postData);
         } catch (WebhookHandlerNotFoundException | WebhookAlreadyHandledException $e) {
             return [
                 "message" => $e->getMessage(),
                 "code" => 200
             ];
-        } catch(AbstractPagarmeCoreException $e) {
+        } catch (AbstractPagarmeCoreException $e) {
             throw new M2WebApiException(
                 new Phrase($e->getMessage()),
                 0,
@@ -82,41 +92,49 @@ public function save($id, $type, $data, $account)
     private function logWebhookIdCaseExistsMetadata($webhookData, $webhookId)
     {
         $metadata = $this->getMetadata($webhookData);
-        if($metadata === false || !array_key_exists('platformVersion', $metadata)) {
+        if ($metadata === false || !array_key_exists('platformVersion', $metadata)) {
             return;
         }
-        if(strpos($metadata['platformVersion'], "Magento") !== false) {
+        if (strpos($metadata['platformVersion'], "Magento") !== false) {
             $logService = new LogService(
                 'Webhook',
                 true
             );
             $logService->info(
                 "Webhook Received but not proccessed",
-                (object)['webhookId' => $webhookId
-            ]);
+                (object)[
+                    'webhookId' => $webhookId
+                ]
+            );
         }
     }
     private function getMetadata($data)
     {
         $metadata = false;
-        if(!array_key_exists('order', $data) && !array_key_exists('subscription', $data)) {
+        if (!array_key_exists('order', $data) && !array_key_exists('subscription', $data)) {
             return false;
         }
-        if(array_key_exists('metadata', $data)) {
+        if (array_key_exists('metadata', $data)) {
             $metadata = $data['metadata'];
         }
         return $metadata;
     }
+    
     private function hasMagentoOrder($data)
     {
         $code = 0;
-        if(array_key_exists('subscription', $data)) {
+        if (array_key_exists('subscription', $data)) {
             $code = $data['subscription']['code'];
         }
-        if(array_key_exists('order', $data)) {
+        if (array_key_exists('order', $data)) {
             $code = $data['order']['code'];
         }
         $order = $this->orderFactory->create()->loadByIncrementId($code);
         return $order->getId() ?? false;
     }
+
+    private function isNotRecipientWebhook($type)
+    {
+        return strpos($type, 'recipient') === false;
+    }
 }
diff --git a/Observer/GooglePayDataAssignObserver.php b/Observer/GooglePayDataAssignObserver.php
new file mode 100644
index 00000000..dba12780
--- /dev/null
+++ b/Observer/GooglePayDataAssignObserver.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Pagarme\Pagarme\Observer;
+
+use Magento\Framework\DataObject;
+use Magento\Payment\Observer\AbstractDataAssignObserver;
+use Magento\Framework\Event\Observer;
+use Magento\Quote\Api\Data\PaymentInterface;
+
+class GooglePayDataAssignObserver extends AbstractDataAssignObserver
+{
+    public function execute(Observer $observer)
+    {
+        $method = $this->readMethodArgument($observer);
+        $info = $method->getInfoInstance();
+        $data = $this->readDataArgument($observer);
+
+        $additionalData = $data->getData(PaymentInterface::KEY_ADDITIONAL_DATA);
+
+        if (!is_object($additionalData)) {
+            $additionalData = new DataObject($additionalData ?: []);
+        }
+        
+        $info->setAdditionalInformation('googlepayData', $additionalData->getData('googlepayData'));
+
+        return $this;
+    }
+}
diff --git a/Observer/PaymentMethodAvailable.php b/Observer/PaymentMethodAvailable.php
index a4bd73e3..a52be6ea 100644
--- a/Observer/PaymentMethodAvailable.php
+++ b/Observer/PaymentMethodAvailable.php
@@ -180,6 +180,9 @@ public function getAvailableConfigMethods()
         if ($this->pagarmeConfig->getPixConfig()->isEnabled()) {
             $paymentMethods[] = "pagarme_pix";
         }
+        if ($this->pagarmeConfig->getGooglePayConfig()->isEnabled()) {
+            $paymentMethods[] = "pagarme_googlepay";
+        }
 
         return $paymentMethods;
     }
diff --git a/Service/Marketplace/RecipientService.php b/Service/Marketplace/RecipientService.php
new file mode 100644
index 00000000..3de930b3
--- /dev/null
+++ b/Service/Marketplace/RecipientService.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Pagarme\Pagarme\Service\Marketplace;
+
+use Pagarme\Core\Marketplace\Aggregates\Recipient;
+use Pagarme\Core\Middle\Proxy\RecipientProxy;
+use Pagarme\Pagarme\Model\CoreAuth;
+
+class RecipientService
+{
+    /**
+     * @var CoreAuth
+     */
+    private $coreAuth;
+
+    public function __construct()
+    {
+        $this->coreAuth = new CoreAuth();
+    }
+
+    public function createRecipient($recipient)
+    {
+        $recipientProxy = new RecipientProxy($this->coreAuth);
+        return $recipientProxy->create($recipient);
+    }
+
+    public function searchRecipient($recipientId)
+    {
+        $recipientProxy = new RecipientProxy($this->coreAuth);
+        $recipient =  $recipientProxy->getFromPagarme($recipientId);
+        $kycStatus = $recipient->kyc_details->status ?? '';
+        $recipient->status = Recipient::parseStatus($recipient->status, $kycStatus);
+        return $recipient;
+    }
+
+    public function createKycLink($recipientId)
+    {
+        $recipientProxy = new RecipientProxy($this->coreAuth);
+        return $recipientProxy->createKycLink($recipientId);
+    }
+}
diff --git a/Setup/InstallSchema.php b/Setup/InstallSchema.php
index 6812e249..098f2990 100755
--- a/Setup/InstallSchema.php
+++ b/Setup/InstallSchema.php
@@ -15,9 +15,10 @@ class InstallSchema implements InstallSchemaInterface
      * {@inheritdoc}
      */
     public function install(
-        SchemaSetupInterface $setup,
+        SchemaSetupInterface   $setup,
         ModuleContextInterface $context
-    ) {
+    )
+    {
         $installer = $setup;
         $installer->startSetup();
 
@@ -40,14 +41,14 @@ public function install(
         $this->installRecurrenceCharge($setup);
         $this->installSubProducts($setup);
         $this->installProductsPlan($setup);
-        $this->installRecipients($setup);
 
         $setup->endSetup();
     }
 
     public function installConfig(
         SchemaSetupInterface $installer
-    ) {
+    )
+    {
         $tableName = $installer->getTable('pagarme_module_core_configuration');
         if (!$installer->getConnection()->isTableExists($tableName)) {
             $configTable = $installer->getConnection()
@@ -92,7 +93,8 @@ public function installConfig(
 
     public function installWebhook(
         SchemaSetupInterface $installer
-    ) {
+    )
+    {
         $tableName = $installer->getTable('pagarme_module_core_webhook');
         if (!$installer->getConnection()->isTableExists($tableName)) {
             $webhookTable = $installer->getConnection()
@@ -138,7 +140,8 @@ public function installWebhook(
 
     public function installOrder(
         SchemaSetupInterface $installer
-    ) {
+    )
+    {
         $tableName = $installer->getTable('pagarme_module_core_order');
         if (!$installer->getConnection()->isTableExists($tableName)) {
             $webhookTable = $installer->getConnection()
@@ -193,7 +196,8 @@ public function installOrder(
 
     public function installCharge(
         SchemaSetupInterface $installer
-    ) {
+    )
+    {
         $tableName = $installer->getTable('pagarme_module_core_charge');
         if (!$installer->getConnection()->isTableExists($tableName)) {
             $webhookTable = $installer->getConnection()
@@ -315,7 +319,8 @@ public function installCharge(
 
     public function installTransaction(
         SchemaSetupInterface $installer
-    ) {
+    )
+    {
         $tableName = $installer->getTable('pagarme_module_core_transaction');
         if (!$installer->getConnection()->isTableExists($tableName)) {
             $webhookTable = $installer->getConnection()
@@ -549,7 +554,7 @@ public function installCard(SchemaSetupInterface $installer)
                     'brand',
                     Table::TYPE_TEXT,
                     255,
-                    ['nullable' => false,  'default' => ''],
+                    ['nullable' => false, 'default' => ''],
                     'Card Brand'
                 )
                 ->setComment('Pagar.me Card Tokens')
@@ -857,9 +862,9 @@ public function installHubToken(SchemaSetupInterface $installer)
         return $installer;
     }
 
-    public function installProductsPlan(SchemaSetupInterface $installer)
+    public function installProductsSubscription(SchemaSetupInterface $installer)
     {
-        $tableName = $installer->getTable('pagarme_module_core_recurrence_products_plan');
+        $tableName = $installer->getTable('pagarme_module_core_recurrence_products_subscription');
         if (!$installer->getConnection()->isTableExists($tableName)) {
             $customer = $installer->getConnection()
                 ->newTable($tableName)
@@ -875,51 +880,6 @@ public function installProductsPlan(SchemaSetupInterface $installer)
                     ],
                     'ID'
                 )
-                ->addColumn(
-                    'interval_type',
-                    Table::TYPE_TEXT,
-                    15,
-                    [
-                        'nullable' => false
-                    ],
-                    'Day, week, month ou year'
-                )
-                ->addColumn(
-                    'interval_count',
-                    Table::TYPE_SMALLINT,
-                    2,
-                    [
-                        'nullable' => false
-                    ],
-                    '1 - 12'
-                )
-                ->addColumn(
-                    'name',
-                    Table::TYPE_TEXT,
-                    255,
-                    [
-                        'nullable' => true
-                    ],
-                    "Product name"
-                )
-                ->addColumn(
-                    'description',
-                    Table::TYPE_TEXT,
-                    500,
-                    [
-                        'nullable' => true
-                    ],
-                    "Product description"
-                )
-                ->addColumn(
-                    'plan_id',
-                    Table::TYPE_TEXT,
-                    21,
-                    [
-                        'nullable' => true
-                    ],
-                    "Api's id"
-                )
                 ->addColumn(
                     'product_id',
                     Table::TYPE_INTEGER,
@@ -939,7 +899,7 @@ public function installProductsPlan(SchemaSetupInterface $installer)
                     "Accepts credit card"
                 )
                 ->addColumn(
-                    'installments',
+                    'allow_installments',
                     Table::TYPE_TEXT,
                     1,
                     [
@@ -957,46 +917,38 @@ public function installProductsPlan(SchemaSetupInterface $installer)
                     "Accepts boleto"
                 )
                 ->addColumn(
-                    'billing_type',
+                    'sell_as_normal_product',
                     Table::TYPE_TEXT,
-                    11,
+                    1,
                     [
                         'nullable' => false
                     ],
-                    "Prepaid, postpaid ou exact_day"
+                    "Allow sell as normal product"
                 )
                 ->addColumn(
-                    'status',
+                    'billing_type',
                     Table::TYPE_TEXT,
                     11,
                     [
                         'nullable' => false
                     ],
-                    "Active, inactive ou deleted"
-                )
-                ->addColumn(
-                    'trial_period_days',
-                    Table::TYPE_TEXT,
-                    11,
-                    [
-                        'nullable' => true
-                    ],
-                    "Trial period in days"
+                    "Prepaid, postpaid ou exact_day"
                 )
                 ->addColumn(
                     'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
                     'Created At'
                 )
                 ->addColumn(
                     'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE],
                     'Updated At'
                 )
+                ->setComment('Product Plan Table')
                 ->setOption('charset', 'utf8');
 
             $installer->getConnection()->createTable($customer);
@@ -1004,11 +956,14 @@ public function installProductsPlan(SchemaSetupInterface $installer)
         return $installer;
     }
 
-    public function installSubProducts(SchemaSetupInterface $installer)
+    public function installSubscriptionItems(SchemaSetupInterface $installer)
     {
-        $tableName = $installer->getTable('pagarme_module_core_recurrence_sub_products');
+        $tableName = $installer->getTable(
+            'pagarme_module_core_recurrence_subscription_items'
+        );
+
         if (!$installer->getConnection()->isTableExists($tableName)) {
-            $customer = $installer->getConnection()
+            $configTable = $installer->getConnection()
                 ->newTable($tableName)
                 ->addColumn(
                     'id',
@@ -1023,177 +978,61 @@ public function installSubProducts(SchemaSetupInterface $installer)
                     'ID'
                 )
                 ->addColumn(
-                    'product_id',
-                    Table::TYPE_INTEGER,
-                    255,
-                    [
-                        'nullable' => false
-                    ],
-                    "Magento's product id"
-                )
-                ->addColumn(
-                    'product_recurrence_id',
-                    Table::TYPE_INTEGER,
-                    255,
+                    'pagarme_id',
+                    Table::TYPE_TEXT,
+                    null,
                     [
                         'nullable' => false
                     ],
-                    'Id from table pagarme_module_core_products_(plan/subscription)'
+                    'format: si_xxxxxxxxxxxxxxxx'
                 )
+                ->setOption('charset', 'utf8')
                 ->addColumn(
-                    'recurrence_type',
+                    'subscription_id',
                     Table::TYPE_TEXT,
-                    255,
+                    null,
                     [
                         'nullable' => false
                     ],
-                    'Type of recurrence product (plan or subscription)'
+                    'format: sub_xxxxxxxxxxxxxxxx'
                 )
+                ->setOption('charset', 'utf8')
                 ->addColumn(
-                    'cycles',
-                    Table::TYPE_INTEGER,
-                    5,
+                    'code',
+                    Table::TYPE_TEXT,
+                    100,
                     [
-                        'nullable' => true
+                        'nullable' => false,
                     ],
-                    'Cycle'
+                    'Product code on platform'
                 )
                 ->addColumn(
                     'quantity',
                     Table::TYPE_INTEGER,
-                    255,
-                    [
-                        'nullable' => true
-                    ],
-                    "Quantity"
-                )
-                ->addColumn(
-                    'trial_period_days',
-                    Table::TYPE_INTEGER,
-                    255,
-                    [
-                        'nullable' => true
-                    ],
-                    "Trial period"
-                )
-                ->addColumn(
-                    'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                    null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
-                    'Created At'
-                )
-                ->addColumn(
-                    'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
-                    null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
-                    'Updated At'
-                )
-                ->addColumn(
-                    'pagarme_id',
-                    Table::TYPE_TEXT,
-                    21,
-                    ['nullable' => true],
-                    'Pagarme Id'
-                )
-                ->setOption('charset', 'utf8');
-
-            $installer->getConnection()->createTable($customer);
-        }
-        return $installer;
-    }
-
-    public function installProductsSubscription(SchemaSetupInterface $installer)
-    {
-        $tableName = $installer->getTable('pagarme_module_core_recurrence_products_subscription');
-        if (!$installer->getConnection()->isTableExists($tableName)) {
-            $customer = $installer->getConnection()
-                ->newTable($tableName)
-                ->addColumn(
-                    'id',
-                    Table::TYPE_INTEGER,
                     null,
                     [
-                        'identity' => true,
                         'unsigned' => true,
                         'nullable' => false,
-                        'primary' => true
-                    ],
-                    'ID'
-                )
-                ->addColumn(
-                    'product_id',
-                    Table::TYPE_INTEGER,
-                    11,
-                    [
-                        'nullable' => true
-                    ],
-                    "Product in Magento's table"
-                )
-                ->addColumn(
-                    'credit_card',
-                    Table::TYPE_TEXT,
-                    1,
-                    [
-                        'nullable' => false
-                    ],
-                    "Accepts credit card"
-                )
-                ->addColumn(
-                    'allow_installments',
-                    Table::TYPE_TEXT,
-                    1,
-                    [
-                        'nullable' => false
-                    ],
-                    "Accepts installments"
-                )
-                ->addColumn(
-                    'boleto',
-                    Table::TYPE_TEXT,
-                    1,
-                    [
-                        'nullable' => false
-                    ],
-                    "Accepts boleto"
-                )
-                ->addColumn(
-                    'sell_as_normal_product',
-                    Table::TYPE_TEXT,
-                    1,
-                    [
-                        'nullable' => false
-                    ],
-                    "Allow sell as normal product"
-                )
-                ->addColumn(
-                    'billing_type',
-                    Table::TYPE_TEXT,
-                    11,
-                    [
-                        'nullable' => false
                     ],
-                    "Prepaid, postpaid ou exact_day"
+                    'Quantity'
                 )
                 ->addColumn(
                     'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
                     'Created At'
                 )
                 ->addColumn(
                     'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE],
                     'Updated At'
                 )
-                ->setComment('Product Plan Table')
                 ->setOption('charset', 'utf8');
 
-            $installer->getConnection()->createTable($customer);
+            $installer->getConnection()->createTable($configTable);
         }
         return $installer;
     }
@@ -1264,16 +1103,16 @@ public function installSubscriptionRepetitions(SchemaSetupInterface $installer)
                 )
                 ->addColumn(
                     'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
                     'Created At'
                 )
                 ->addColumn(
                     'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE],
                     'Updated At'
                 )
                 ->setOption('charset', 'utf8');
@@ -1405,16 +1244,16 @@ public function installRecurrenceSubscription(SchemaSetupInterface $installer)
                 )
                 ->addColumn(
                     'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
                     'Created At'
                 )
                 ->addColumn(
                     'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE],
                     'Updated At'
                 )
                 ->setOption('charset', 'utf8');
@@ -1570,30 +1409,30 @@ public function installRecurrenceCharge(SchemaSetupInterface $installer)
                 ->setOption('charset', 'utf8')
                 ->addColumn(
                     'cycle_start',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
                     ['nullable' => false],
                     'Cycle Start'
                 )
                 ->addColumn(
                     'cycle_end',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
                     ['nullable' => false],
                     'Cycle End'
                 )
                 ->addColumn(
                     'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
                     'Created At'
                 )
                 ->addColumn(
                     'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE],
                     'Updated At'
                 )
                 ->setOption('charset', 'utf8');
@@ -1603,14 +1442,11 @@ public function installRecurrenceCharge(SchemaSetupInterface $installer)
         return $installer;
     }
 
-    public function installSubscriptionItems(SchemaSetupInterface $installer)
+    public function installSubProducts(SchemaSetupInterface $installer)
     {
-        $tableName = $installer->getTable(
-            'pagarme_module_core_recurrence_subscription_items'
-        );
-
+        $tableName = $installer->getTable('pagarme_module_core_recurrence_sub_products');
         if (!$installer->getConnection()->isTableExists($tableName)) {
-            $configTable = $installer->getConnection()
+            $customer = $installer->getConnection()
                 ->newTable($tableName)
                 ->addColumn(
                     'id',
@@ -1625,68 +1461,90 @@ public function installSubscriptionItems(SchemaSetupInterface $installer)
                     'ID'
                 )
                 ->addColumn(
-                    'pagarme_id',
-                    Table::TYPE_TEXT,
-                    null,
+                    'product_id',
+                    Table::TYPE_INTEGER,
+                    255,
                     [
                         'nullable' => false
                     ],
-                    'format: si_xxxxxxxxxxxxxxxx'
+                    "Magento's product id"
                 )
-                ->setOption('charset', 'utf8')
                 ->addColumn(
-                    'subscription_id',
-                    Table::TYPE_TEXT,
-                    null,
+                    'product_recurrence_id',
+                    Table::TYPE_INTEGER,
+                    255,
                     [
                         'nullable' => false
                     ],
-                    'format: sub_xxxxxxxxxxxxxxxx'
+                    'Id from table pagarme_module_core_products_(plan/subscription)'
                 )
-                ->setOption('charset', 'utf8')
                 ->addColumn(
-                    'code',
+                    'recurrence_type',
                     Table::TYPE_TEXT,
-                    100,
+                    255,
                     [
-                        'nullable' => false,
+                        'nullable' => false
                     ],
-                    'Product code on platform'
+                    'Type of recurrence product (plan or subscription)'
+                )
+                ->addColumn(
+                    'cycles',
+                    Table::TYPE_INTEGER,
+                    5,
+                    [
+                        'nullable' => true
+                    ],
+                    'Cycle'
                 )
                 ->addColumn(
                     'quantity',
                     Table::TYPE_INTEGER,
-                    null,
+                    255,
                     [
-                        'unsigned' => true,
-                        'nullable' => false,
+                        'nullable' => true
                     ],
-                    'Quantity'
+                    "Quantity"
+                )
+                ->addColumn(
+                    'trial_period_days',
+                    Table::TYPE_INTEGER,
+                    255,
+                    [
+                        'nullable' => true
+                    ],
+                    "Trial period"
                 )
                 ->addColumn(
                     'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
                     'Created At'
                 )
                 ->addColumn(
                     'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE],
                     'Updated At'
                 )
+                ->addColumn(
+                    'pagarme_id',
+                    Table::TYPE_TEXT,
+                    21,
+                    ['nullable' => true],
+                    'Pagarme Id'
+                )
                 ->setOption('charset', 'utf8');
 
-            $installer->getConnection()->createTable($configTable);
+            $installer->getConnection()->createTable($customer);
         }
         return $installer;
     }
 
-    public function installRecipients(SchemaSetupInterface $installer)
+    public function installProductsPlan(SchemaSetupInterface $installer)
     {
-        $tableName = $installer->getTable('pagarme_module_core_recipients');
+        $tableName = $installer->getTable('pagarme_module_core_recurrence_products_plan');
         if (!$installer->getConnection()->isTableExists($tableName)) {
             $customer = $installer->getConnection()
                 ->newTable($tableName)
@@ -1703,71 +1561,125 @@ public function installRecipients(SchemaSetupInterface $installer)
                     'ID'
                 )
                 ->addColumn(
-                    'external_id',
+                    'interval_type',
                     Table::TYPE_TEXT,
-                    null,
+                    15,
                     [
                         'nullable' => false
                     ],
-                    'External ID'
+                    'Day, week, month ou year'
+                )
+                ->addColumn(
+                    'interval_count',
+                    Table::TYPE_SMALLINT,
+                    2,
+                    [
+                        'nullable' => false
+                    ],
+                    '1 - 12'
                 )
                 ->addColumn(
                     'name',
                     Table::TYPE_TEXT,
                     255,
+                    [
+                        'nullable' => true
+                    ],
+                    "Product name"
+                )
+                ->addColumn(
+                    'description',
+                    Table::TYPE_TEXT,
+                    500,
+                    [
+                        'nullable' => true
+                    ],
+                    "Product description"
+                )
+                ->addColumn(
+                    'plan_id',
+                    Table::TYPE_TEXT,
+                    21,
+                    [
+                        'nullable' => true
+                    ],
+                    "Api's id"
+                )
+                ->addColumn(
+                    'product_id',
+                    Table::TYPE_INTEGER,
+                    11,
+                    [
+                        'nullable' => true
+                    ],
+                    "Product in Magento's table"
+                )
+                ->addColumn(
+                    'credit_card',
+                    Table::TYPE_TEXT,
+                    1,
                     [
                         'nullable' => false
                     ],
-                    'Name'
+                    "Accepts credit card"
                 )
                 ->addColumn(
-                    'email',
+                    'installments',
                     Table::TYPE_TEXT,
-                    255,
+                    1,
                     [
                         'nullable' => false
                     ],
-                    'Email'
+                    "Accepts installments"
                 )
                 ->addColumn(
-                    'document_type',
+                    'boleto',
                     Table::TYPE_TEXT,
-                    255,
+                    1,
                     [
                         'nullable' => false
                     ],
-                    'Document Type'
+                    "Accepts boleto"
                 )
                 ->addColumn(
-                    'document',
+                    'billing_type',
                     Table::TYPE_TEXT,
-                    255,
+                    11,
                     [
                         'nullable' => false
                     ],
-                    'Document'
+                    "Prepaid, postpaid ou exact_day"
                 )
                 ->addColumn(
-                    'pagarme_id',
+                    'status',
                     Table::TYPE_TEXT,
-                    null,
+                    11,
                     [
                         'nullable' => false
                     ],
-                    'format: rp_xxxxxxxxxxxxxxxx'
+                    "Active, inactive ou deleted"
+                )
+                ->addColumn(
+                    'trial_period_days',
+                    Table::TYPE_TEXT,
+                    11,
+                    [
+                        'nullable' => true
+                    ],
+                    "Trial period in days"
                 )
                 ->addColumn(
                     'created_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT],
                     'Created At'
                 )
                 ->addColumn(
                     'updated_at',
-                    \Magento\Framework\DB\Ddl\Table::TYPE_TIMESTAMP,
+                    Table::TYPE_TIMESTAMP,
                     null,
-                    ['nullable' => false, 'default' => \Magento\Framework\DB\Ddl\Table::TIMESTAMP_INIT_UPDATE],
+                    ['nullable' => false, 'default' => Table::TIMESTAMP_INIT_UPDATE],
                     'Updated At'
                 )
                 ->setOption('charset', 'utf8');
diff --git a/Setup/UpgradeSchema.php b/Setup/UpgradeSchema.php
index 53e51d0a..05d4b6da 100644
--- a/Setup/UpgradeSchema.php
+++ b/Setup/UpgradeSchema.php
@@ -3,9 +3,9 @@
 namespace Pagarme\Pagarme\Setup;
 
 use Magento\Framework\DB\Ddl\Table;
-use Magento\Framework\Setup\UpgradeSchemaInterface;
 use Magento\Framework\Setup\ModuleContextInterface;
 use Magento\Framework\Setup\SchemaSetupInterface;
+use Magento\Framework\Setup\UpgradeSchemaInterface;
 
 class UpgradeSchema implements UpgradeSchemaInterface
 {
@@ -14,9 +14,10 @@ class UpgradeSchema implements UpgradeSchemaInterface
      * {@inheritdoc}
      */
     public function upgrade(
-        SchemaSetupInterface $setup,
+        SchemaSetupInterface   $setup,
         ModuleContextInterface $context
-    ) {
+    )
+    {
         $setup->startSetup();
         $version = $context->getVersion();
         $installSchema = new InstallSchema();
@@ -25,33 +26,55 @@ public function upgrade(
             $setup = $installSchema->installHubToken($setup);
         }
 
-        if (version_compare($version, "1.2.0", "<")) {
-            $setup = $installSchema->installRecipients($setup);
-        }
-
         if (version_compare($version, '2.2.5', '<')) {
             $connection = $setup->getConnection();
-            $connection->addColumn(
-                $setup->getTable('pagarme_module_core_recurrence_products_plan'),
-                'apply_discount_in_all_product_cycles',
-                [
-                    'type' => Table::TYPE_SMALLINT,
-                    'length' => 1,
-                    'nullable' => true,
-                    'comment' => 'Apply products cycle to discount'
-                ]
-            );
-
-            $connection->addColumn(
-                $setup->getTable('pagarme_module_core_recurrence_products_subscription'),
-                'apply_discount_in_all_product_cycles',
-                [
-                    'type' => Table::TYPE_SMALLINT,
-                    'length' => 1,
-                    'nullable' => true,
-                    'comment' => 'Apply products cycle to discount'
-                ]
-            );
+            if ($connection->tableColumnExists(
+                'pagarme_module_core_recurrence_products_plan',
+                'apply_discount_in_all_product_cycles'
+            ) === false) {
+                $connection->addColumn(
+                    $setup->getTable('pagarme_module_core_recurrence_products_plan'),
+                    'apply_discount_in_all_product_cycles',
+                    [
+                        'type' => Table::TYPE_SMALLINT,
+                        'length' => 1,
+                        'nullable' => true,
+                        'comment' => 'Apply products cycle to discount'
+                    ]
+                );
+            }
+
+            if ($connection->tableColumnExists(
+                'pagarme_module_core_recurrence_products_subscription',
+                'apply_discount_in_all_product_cycles'
+            ) === false) {
+                $connection->addColumn(
+                    $setup->getTable('pagarme_module_core_recurrence_products_subscription'),
+                    'apply_discount_in_all_product_cycles',
+                    [
+                        'type' => Table::TYPE_SMALLINT,
+                        'length' => 1,
+                        'nullable' => true,
+                        'comment' => 'Apply products cycle to discount'
+                    ]
+                );
+            }
+        }
+
+        if (version_compare($context->getVersion(), '2.5.0', '<')) {
+            if ($setup->getConnection()->tableColumnExists('pagarme_module_core_recipients', 'type') === false) {
+                $setup->getConnection()->changeColumn(
+                    $setup->getTable('pagarme_module_core_recipients'),
+                    'document_type',
+                    'type',
+                    [
+                        'type' => Table::TYPE_TEXT,
+                        'length' => 11,
+                        'nullable' => 'false',
+                        'comment' => 'Recipient document type: individual (CPF) or corporation (CNPJ)'
+                    ]
+                );
+            }
         }
 
         $setup->endSetup();
diff --git a/Test/Unit/Block/Adminhtml/Marketplace/RecipientTest.php b/Test/Unit/Block/Adminhtml/Marketplace/RecipientTest.php
new file mode 100644
index 00000000..c0817986
--- /dev/null
+++ b/Test/Unit/Block/Adminhtml/Marketplace/RecipientTest.php
@@ -0,0 +1,115 @@
+<?php
+
+namespace Pagarme\Pagarme\Test\Unit\Block\Adminhtml\Marketplace;
+
+use Mockery;
+use stdClass;
+use ReflectionClass;
+use Magento\Framework\Registry;
+use Magento\Directory\Model\Country;
+use Pagarme\Pagarme\Test\Unit\BaseTest;
+use Magento\Framework\View\Element\Template\Context;
+use Pagarme\Pagarme\Block\Adminhtml\Marketplace\Recipient;
+use Pagarme\Core\Marketplace\Interfaces\RecipientInterface;
+use Magento\Customer\Model\ResourceModel\Customer\Collection;
+use Pagarme\Core\Marketplace\Repositories\RecipientRepository;
+use Magento\Customer\Model\ResourceModel\Customer\CollectionFactory;
+
+class RecipientTest extends BaseTest
+{
+    /**
+     * @dataProvider statusDataProvider
+     */
+    public function testGetEditRecipientShouldReturnRecipientWithCorrectStatusLabel($status, $expectedStatusLabel)
+    {
+        $contextMock = Mockery::spy(Context::class);
+
+
+        $recipientData = new stdClass();
+        $recipient = new stdClass();
+        $recipientData->recipient = $recipient;
+        $recipientData->externalId = 'easd';
+        $recipientData->localId = '234';
+        $recipientData->status = $status;
+        $recipientData->statusUpdated = true;
+
+        $registryMock = Mockery::mock(Registry::class);
+        $registryMock->shouldReceive('registry')
+            ->with('recipient_data')
+            ->andReturn(json_encode($recipientData));
+        $registryMock->shouldReceive('registry')
+            ->with('sellers')
+            ->andReturnNull();
+
+        $collectionMock = Mockery::mock(Collection::class);
+
+        $collectionFactoryMock = Mockery::mock(CollectionFactory::class);
+        $collectionFactoryMock->shouldReceive('create')
+            ->andReturn($collectionMock);
+
+        $countryMock = Mockery::mock(Country::class);
+
+        $moduleCoreSetupMock = Mockery::mock('alias:Pagarme\Core\Kernel\Abstractions\AbstractModuleCoreSetup');
+        $moduleCoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+        $recipientRepositoryMock = Mockery::mock(RecipientRepository::class);
+
+        $recipientBlock = new Recipient(
+            $contextMock,
+            $registryMock,
+            $collectionFactoryMock,
+            $countryMock,
+            $recipientRepositoryMock
+        );
+
+        $editedRecipient = $recipientBlock->getEditRecipient();
+
+        $this->assertStringContainsString("\"statusLabel\":\"$expectedStatusLabel\"", $editedRecipient);
+    }
+
+
+    public function testGetEditRecipientShouldReturnEmpty()
+    {
+        $contextSpy = Mockery::spy(Context::class);
+        $registrySpy = Mockery::spy(Registry::class);
+        $collectionMock = Mockery::mock(Collection::class);
+
+        $collectionFactoryMock = Mockery::mock(CollectionFactory::class);
+        $collectionFactoryMock->shouldReceive('create')
+            ->andReturn($collectionMock);
+
+        $countryMock = Mockery::mock(Country::class);
+
+        $moduleCoreSetupMock = Mockery::mock('alias:Pagarme\Core\Kernel\Abstractions\AbstractModuleCoreSetup');
+        $moduleCoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+        $recipientRepositoryMock = Mockery::mock(RecipientRepository::class);
+
+
+        $recipientBlock = new Recipient(
+            $contextSpy,
+            $registrySpy,
+            $collectionFactoryMock,
+            $countryMock,
+            $recipientRepositoryMock
+        );
+
+        $this->assertEmpty($recipientBlock->getEditRecipient());
+    }
+
+    public function statusDataProvider()
+    {
+        return [
+            "Registered status" => [RecipientInterface::REGISTERED, "Registered"],
+            "Validation Request status" => [RecipientInterface::VALIDATION_REQUESTED, "Validation Requested"],
+            "Waiting for analysis status" => [RecipientInterface::WAITING_FOR_ANALYSIS, "Waiting For Analysis"],
+            "Active status" => [RecipientInterface::ACTIVE, "Approved"],
+            "Disapproved status" => [RecipientInterface::DISAPPROVED, "Disapproved"],
+            "Suspended status" => [RecipientInterface::SUSPENDED, "Suspended"],
+            "Blocked status" => [RecipientInterface::BLOCKED, "Blocked"],
+            "Inactive status" => [RecipientInterface::INACTIVE, "Inactive"],
+        ];
+    }
+}
diff --git a/Test/Unit/Controller/Adminhtml/Recipients/CreateTest.php b/Test/Unit/Controller/Adminhtml/Recipients/CreateTest.php
new file mode 100644
index 00000000..f45e5e95
--- /dev/null
+++ b/Test/Unit/Controller/Adminhtml/Recipients/CreateTest.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace Pagarme\Pagarme\Test\Unit\Controller\Adminhtml\Recipients;
+
+use Mockery;
+use Magento\Framework\Registry;
+use Pagarme\Pagarme\Model\Recipient;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\Page;
+use Pagarme\Pagarme\Test\Unit\BaseTest;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Framework\View\Result\PageFactory;
+use PagarmeCoreApiLib\Models\GetRecipientResponse;
+use Magento\Framework\Module\Manager as ModuleManager;
+use Pagarme\Pagarme\Service\Marketplace\RecipientService;
+use Pagarme\Pagarme\Controller\Adminhtml\Recipients\Create;
+use Magento\Framework\Message\Factory as MagentoMessageFactory;
+use Pagarme\Pagarme\Model\ResourceModel\Recipients as ResourceModelRecipient;
+
+class CreateTest extends BaseTest
+{
+    public function testExecuteShouldUpdateRecipientStatus()
+    {
+        $contextSpy = Mockery::spy(Context::class);
+
+        $sellerCollectionMock = Mockery::mock('Webkul\Marketplace\Model\ResourceModel\Seller\Collection');
+        $sellerCollectionMock->shouldReceive('getItems')
+            ->andReturn([]);
+
+        $sellerFactoryMock = Mockery::mock('Webkul\Marketplace\Model\SellerFactory');
+        $sellerFactoryMock->shouldReceive('create')
+            ->andReturnSelf();
+        $sellerFactoryMock->shouldReceive('getCollection')
+            ->andReturnSelf();
+        $sellerFactoryMock->shouldReceive('load')
+            ->andReturn($sellerCollectionMock);
+
+        $requestMock = Mockery::mock(RequestInterface::class);
+        $requestMock->shouldReceive('getParam')
+            ->andReturn(1);
+
+        $objectManagerMock = Mockery::mock(ObjectManagerInterface::class);
+        $objectManagerMock->shouldReceive('create')
+            ->andReturn($sellerFactoryMock);
+
+        $contextSpy->shouldReceive('getObjectManager')
+            ->andReturn($objectManagerMock);
+        $contextSpy->shouldReceive('getRequest')
+            ->andReturn($requestMock);
+
+        $registryMock = Mockery::mock(Registry::class);
+        $registryMock->shouldReceive('register')
+            ->withArgs(function ($key, $data) {
+                return $key === 'sellers' || ($key === 'recipient_data' && strpos($data, '"statusUpdated":true') !== false);
+            })
+            ->andReturnSelf();
+
+        $pageMock = Mockery::mock(Page::class);
+        $pageMock->shouldReceive('getConfig')
+            ->andReturnSelf();
+        $pageMock->shouldReceive('getTitle')
+            ->andReturnSelf();
+        $pageMock->shouldReceive('prepend')
+            ->andReturnSelf();
+
+        $pageFactoryMock = Mockery::mock(PageFactory::class);
+        $pageFactoryMock->shouldReceive('create')
+            ->andReturn($pageMock);
+
+        $magentoMessageFactoryMock = Mockery::mock(MagentoMessageFactory::class);
+
+        $moduleManagerMock = Mockery::mock(ModuleManager::class);
+        $moduleManagerMock->shouldReceive('isEnabled')
+            ->andReturnTrue();
+
+        $resourceModelRecipientSpy = Mockery::spy(ResourceModelRecipient::class);
+
+        $recipientSpy = Mockery::spy(Recipient::class);
+        $recipientSpy->shouldReceive('getStatus')
+            ->andReturnNull();
+
+        $recipientResponse = new GetRecipientResponse();
+        $recipientResponse->id = 'rp_xxxxxxxxxxx';
+        $recipientResponse->status = 'active';
+        $recipientServiceMock = Mockery::mock(RecipientService::class);
+        $recipientServiceMock->shouldReceive('searchRecipient')
+            ->andReturn($recipientResponse);
+
+        $moduleCoreSetupMock = Mockery::mock('alias:Pagarme\Core\Kernel\Abstractions\AbstractModuleCoreSetup');
+        $moduleCoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+        $createController = new Create(
+            $contextSpy,
+            $registryMock,
+            $pageFactoryMock,
+            $magentoMessageFactoryMock,
+            $moduleManagerMock,
+            $resourceModelRecipientSpy,
+            $recipientSpy,
+            $recipientServiceMock
+        );
+
+
+        $this->assertInstanceOf(Page::class, $createController->execute());
+    }
+
+    public function testExecuteShouldNotUpdateRecipientStatus()
+    {
+        $contextSpy = Mockery::spy(Context::class);
+
+        $sellerCollectionMock = Mockery::mock('Webkul\Marketplace\Model\ResourceModel\Seller\Collection');
+        $sellerCollectionMock->shouldReceive('getItems')
+            ->andReturn([]);
+
+        $sellerFactoryMock = Mockery::mock('Webkul\Marketplace\Model\SellerFactory');
+        $sellerFactoryMock->shouldReceive('create')
+            ->andReturnSelf();
+        $sellerFactoryMock->shouldReceive('getCollection')
+            ->andReturnSelf();
+        $sellerFactoryMock->shouldReceive('load')
+            ->andReturn($sellerCollectionMock);
+
+        $requestMock = Mockery::mock(RequestInterface::class);
+        $requestMock->shouldReceive('getParam')
+            ->andReturn(1);
+
+        $objectManagerMock = Mockery::mock(ObjectManagerInterface::class);
+        $objectManagerMock->shouldReceive('create')
+            ->andReturn($sellerFactoryMock);
+
+        $contextSpy->shouldReceive('getObjectManager')
+            ->andReturn($objectManagerMock);
+        $contextSpy->shouldReceive('getRequest')
+            ->andReturn($requestMock);
+
+        $registryMock = Mockery::mock(Registry::class);
+        $registryMock->shouldReceive('register')
+            ->withArgs(function ($key, $data) {
+                return $key === 'sellers' || ($key === 'recipient_data' && strpos($data, '"statusUpdated":false') !== false);
+            })
+            ->andReturnSelf();
+
+        $pageMock = Mockery::mock(Page::class);
+        $pageMock->shouldReceive('getConfig')
+            ->andReturnSelf();
+        $pageMock->shouldReceive('getTitle')
+            ->andReturnSelf();
+        $pageMock->shouldReceive('prepend')
+            ->andReturnSelf();
+
+        $pageFactoryMock = Mockery::mock(PageFactory::class);
+        $pageFactoryMock->shouldReceive('create')
+            ->andReturn($pageMock);
+
+        $magentoMessageFactoryMock = Mockery::mock(MagentoMessageFactory::class);
+
+        $moduleManagerMock = Mockery::mock(ModuleManager::class);
+        $moduleManagerMock->shouldReceive('isEnabled')
+            ->andReturnTrue();
+
+        $resourceModelRecipientSpy = Mockery::spy(ResourceModelRecipient::class);
+
+        $recipientSpy = Mockery::spy(Recipient::class);
+        $recipientSpy->shouldReceive('getStatus')
+            ->andReturn('active');
+
+        $recipientResponse = new GetRecipientResponse();
+        $recipientResponse->id = 'rp_xxxxxxxxxxx';
+        $recipientResponse->status = 'active';
+        $recipientServiceMock = Mockery::mock(RecipientService::class);
+        $recipientServiceMock->shouldReceive('searchRecipient')
+            ->andReturn($recipientResponse);
+
+        $moduleCoreSetupMock = Mockery::mock('alias:Pagarme\Core\Kernel\Abstractions\AbstractModuleCoreSetup');
+        $moduleCoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+        $createController = new Create(
+            $contextSpy,
+            $registryMock,
+            $pageFactoryMock,
+            $magentoMessageFactoryMock,
+            $moduleManagerMock,
+            $resourceModelRecipientSpy,
+            $recipientSpy,
+            $recipientServiceMock
+        );
+
+
+        $this->assertInstanceOf(Page::class, $createController->execute());
+    }
+}
diff --git a/Test/Unit/Model/Api/RecipientTest.php b/Test/Unit/Model/Api/RecipientTest.php
new file mode 100644
index 00000000..e180ce35
--- /dev/null
+++ b/Test/Unit/Model/Api/RecipientTest.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Pagarme\Pagarme\Test\Unit\Model\Api;
+
+use Mockery;
+use Pagarme\Pagarme\Test\Unit\BaseTest;
+use Pagarme\Pagarme\Model\Api\Recipient;
+use Magento\Framework\Webapi\Rest\Request;
+use Pagarme\Pagarme\Model\RecipientFactory;
+use Pagarme\Pagarme\Model\Api\KycLinkResponse;
+use PagarmeCoreApiLib\Models\CreateKycLinkResponse;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Pagarme\Pagarme\Model\Recipient as RecipientModel;
+use Pagarme\Pagarme\Api\KycLinkResponseInterfaceFactory;
+use Pagarme\Pagarme\Service\Marketplace\RecipientService;
+use Pagarme\Core\Middle\Factory\RecipientFactory as CoreRecipient;
+use Pagarme\Pagarme\Model\ResourceModel\Recipients as ResourceModelRecipient;
+
+class RecipientTest extends BaseTest
+{
+    public function testCreateKycLinkShouldReturnQrCodeAndLink()
+    {
+        $requestMock = Mockery::mock(Request::class);
+
+        $recipientModelMock = Mockery::mock(RecipientModel::class);
+        $recipientModelMock->shouldReceive('getPagarmeId')
+            ->andReturn('rp_xxxxxxxxxxxxxxxx');
+
+        $recipientFactoryMock = Mockery::mock(RecipientFactory::class);
+        $recipientFactoryMock->shouldReceive('create')
+            ->andReturn($recipientModelMock);
+
+        $resourceModelRecipientMock = Mockery::mock(ResourceModelRecipient::class);
+        $resourceModelRecipientMock->shouldReceive('load')
+            ->andReturnSelf();
+
+        $coreRecipientMock = Mockery::mock(CoreRecipient::class);
+
+        $base64QrCode = "UGFyYWLDqW5zIHBlbGEgc3VhIGN1cmlvc2lkYWRl";
+        $kycUrl = 'http://test.test/';
+        $createKyLinkResponseMock = new CreateKycLinkResponse($kycUrl, $base64QrCode, '2024-04-29T09:22:08Z');
+        $recipientServiceMock = Mockery::mock(RecipientService::class);
+        $recipientServiceMock->shouldReceive('createKycLink')
+            ->andReturn($createKyLinkResponseMock);
+
+        $kycLinkResponse = new KycLinkResponse();
+        $kycLinkResponseFactoryMock = Mockery::mock(KycLinkResponseInterfaceFactory::class);
+        $kycLinkResponseFactoryMock->shouldReceive('create')
+            ->andReturn($kycLinkResponse);
+
+        $recipientModelApi = new Recipient(
+            $requestMock,
+            $recipientFactoryMock,
+            $resourceModelRecipientMock,
+            $coreRecipientMock,
+            $recipientServiceMock,
+            $kycLinkResponseFactoryMock
+        );
+
+        $result = $recipientModelApi->createKycLink(1);
+
+        $expectedBase64QrCode = "data:image/svg+xml;base64,$base64QrCode";
+        $this->assertSame($kycUrl, $result->getUrl());
+        $this->assertSame($expectedBase64QrCode, $result->getQrCode());
+    }
+
+    public function testCreateKycLinkShouldNotFoundRecipient()
+    {
+        $requestMock = Mockery::mock(Request::class);
+
+        $recipientModelMock = Mockery::mock(RecipientModel::class);
+        $recipientModelMock->shouldReceive('getPagarmeId')
+            ->andReturnNull();
+
+        $recipientFactoryMock = Mockery::mock(RecipientFactory::class);
+        $recipientFactoryMock->shouldReceive('create')
+            ->andReturn($recipientModelMock);
+
+        $resourceModelRecipientMock = Mockery::mock(ResourceModelRecipient::class);
+        $resourceModelRecipientMock->shouldReceive('load')
+            ->andReturnSelf();
+
+        $coreRecipientMock = Mockery::mock(CoreRecipient::class);
+
+        $recipientServiceMock = Mockery::mock(RecipientService::class);
+
+        $kycLinkResponseFactoryMock = Mockery::mock(KycLinkResponseInterfaceFactory::class);
+
+        $recipientModelApi = new Recipient(
+            $requestMock,
+            $recipientFactoryMock,
+            $resourceModelRecipientMock,
+            $coreRecipientMock,
+            $recipientServiceMock,
+            $kycLinkResponseFactoryMock
+        );
+
+        $this->expectException(NoSuchEntityException::class);
+        $this->expectExceptionMessage('Recipient not founded.');
+
+        $recipientModelApi->createKycLink(1);
+    }
+
+    public function testCreateKycLinkShouldNotGenerateSecurityValidation()
+    {
+        $requestMock = Mockery::mock(Request::class);
+
+        $recipientModelMock = Mockery::mock(RecipientModel::class);
+        $recipientModelMock->shouldReceive('getPagarmeId')
+            ->andReturn('rp_xxxxxxxxxxxxxxxx');
+
+        $recipientFactoryMock = Mockery::mock(RecipientFactory::class);
+        $recipientFactoryMock->shouldReceive('create')
+            ->andReturn($recipientModelMock);
+
+        $resourceModelRecipientMock = Mockery::mock(ResourceModelRecipient::class);
+        $resourceModelRecipientMock->shouldReceive('load')
+            ->andReturnSelf();
+
+        $coreRecipientMock = Mockery::mock(CoreRecipient::class);
+
+        $createKyLinkResponseMock = new CreateKycLinkResponse();
+        $recipientServiceMock = Mockery::mock(RecipientService::class);
+        $recipientServiceMock->shouldReceive('createKycLink')
+            ->andReturn($createKyLinkResponseMock);
+
+        $kycLinkResponseFactoryMock = Mockery::mock(KycLinkResponseInterfaceFactory::class);
+
+        $recipientModelApi = new Recipient(
+            $requestMock,
+            $recipientFactoryMock,
+            $resourceModelRecipientMock,
+            $coreRecipientMock,
+            $recipientServiceMock,
+            $kycLinkResponseFactoryMock
+        );
+
+        $this->expectException(NoSuchEntityException::class);
+        $this->expectExceptionMessage('Failed to generate the security validation link.');
+
+        $recipientModelApi->createKycLink(1);
+    }
+}
diff --git a/Test/Unit/Model/WebhookManagementTest.php b/Test/Unit/Model/WebhookManagementTest.php
new file mode 100644
index 00000000..a467806a
--- /dev/null
+++ b/Test/Unit/Model/WebhookManagementTest.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace Pagarme\Pagarme\Test\Unit\Model;
+
+use Mockery;
+use Magento\Sales\Model\Order;
+use Pagarme\Pagarme\Model\Account;
+use Magento\Sales\Model\OrderFactory;
+use Pagarme\Pagarme\Test\Unit\BaseTest;
+use Pagarme\Pagarme\Model\WebhookManagement;
+use Pagarme\Core\Webhook\Services\WebhookReceiverService;
+
+class WebhookManagementTest extends BaseTest
+{
+    public function testSaveWithRecipientWebhook()
+    {
+        $moduleCoreSetupMock = Mockery::mock('alias:Pagarme\Core\Kernel\Abstractions\AbstractModuleCoreSetup');
+        $moduleCoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+
+        $orderMock = Mockery::mock(Order::class);
+        $orderMock->shouldReceive('loadByIncrementId')
+            ->andReturnSelf();
+        $orderMock->shouldReceive('getId')
+            ->andReturnFalse();
+
+        $orderFactoryMock = Mockery::mock(OrderFactory::class);
+        $orderFactoryMock->shouldReceive('create')
+            ->andReturn($orderMock);
+        $accountMock = Mockery::mock(Account::class);
+        
+        $webhookReceiverServiceMock = Mockery::mock(WebhookReceiverService::class);
+        $webhookRecipientResponse = [
+            'message' => 'Recipient updated',
+            'code' => 200
+        ];
+        $webhookReceiverServiceMock->shouldReceive('handle')
+            ->once()
+            ->andReturn($webhookRecipientResponse);
+
+        $webhookManagement = new WebhookManagement($orderFactoryMock, $accountMock, $webhookReceiverServiceMock);
+
+        $id = "hook_aaaaaaaaaaaaaaaa";
+        $type = "recipient.updated";
+        $data = [
+            "id" => 'rp_xxxxxxxxxxxxxxxx',
+            "name" => "Test recipient",
+            "email" => "test@recipient.test",
+            "document" => "11111111111",
+            "description" => "Test description",
+            "type" => "individual",
+            "payment_mode" => "bank_transfer",
+            "status" => "active",
+            "kyc_details" =>
+            [
+                "status" => "approved"
+            ],
+        ];
+
+        $account = [
+            "id" => "acc_xxxxxxxxxxxxxxxx",
+            "name" => "Account Test"
+        ];
+        $result = $webhookManagement->save($id, $type, $data, $account);
+
+        $this->assertSame($webhookRecipientResponse, $result);
+    }
+
+
+    public function testSaveWithNonPlatformWebhook()
+    {
+        $moduleCoreSetupMock = Mockery::mock('alias:Pagarme\Core\Kernel\Abstractions\AbstractModuleCoreSetup');
+        $moduleCoreSetupMock->shouldReceive('bootstrap')
+            ->andReturnSelf();
+
+
+        $orderMock = Mockery::mock(Order::class);
+        $orderMock->shouldReceive('loadByIncrementId')
+            ->andReturnSelf();
+        $orderMock->shouldReceive('getId')
+            ->andReturnFalse();
+
+        $orderFactoryMock = Mockery::mock(OrderFactory::class);
+        $orderFactoryMock->shouldReceive('create')
+            ->andReturn($orderMock);
+            
+        $accountMock = Mockery::mock(Account::class);
+        
+        $webhookReceiverServiceMock = Mockery::mock(WebhookReceiverService::class);
+        $expectedResponse = [
+            'message' => 'Webhook Received',
+            'code' => 200
+        ];
+
+        $webhookManagement = new WebhookManagement($orderFactoryMock, $accountMock, $webhookReceiverServiceMock);
+
+        $id = "hook_aaaaaaaaaaaaaaaa";
+        $type = "charge.paid";
+        $data = [];
+
+        $account = [
+            "id" => "acc_xxxxxxxxxxxxxxxx",
+            "name" => "Account Test"
+        ];
+        $result = $webhookManagement->save($id, $type, $data, $account);
+
+        $this->assertSame($expectedResponse, $result);
+    }
+}
diff --git a/Ui/Component/Column/RecipientActions.php b/Ui/Component/Column/RecipientActions.php
new file mode 100644
index 00000000..88ba2687
--- /dev/null
+++ b/Ui/Component/Column/RecipientActions.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Pagarme\Pagarme\Ui\Component\Column;
+
+class RecipientActions extends Actions
+{
+    protected function getActions($name, $type, $item)
+    {
+        $actions = parent::getActions($name, $type, $item);
+        $actions[$name]['edit']['label'] = __('View');
+
+        return $actions;
+    }
+}
diff --git a/composer.json b/composer.json
index df9e6d5c..f4fda02f 100755
--- a/composer.json
+++ b/composer.json
@@ -1,12 +1,12 @@
 {
     "name": "pagarme/pagarme-magento2-module",
     "license": "MIT",
-    "version": "2.4.2",
+    "version": "2.5.0",
     "type": "magento2-module",
     "description": "Magento 2 Module Pagar.me",
     "require": {
         "php": ">=7.1",
-        "pagarme/ecommerce-module-core": "~2.4.1"
+        "pagarme/ecommerce-module-core": "~2.5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5 | ^6 | ^7 | ^8 | ^9",
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 2e30883f..7ffd2989 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -17,6 +17,7 @@
 				<include path="Pagarme_Pagarme::system/transaction/creditcard.xml"/>
 				<include path="Pagarme_Pagarme::system/transaction/pix.xml"/>
 				<include path="Pagarme_Pagarme::system/transaction/billet.xml"/>
+				<include path="Pagarme_Pagarme::system/transaction/googlepay.xml"/>
 				<include path="Pagarme_Pagarme::system/transaction/multipleactionstwocreditcard.xml"/>
 				<include path="Pagarme_Pagarme::system/transaction/multipleactionscreditcardbillet.xml"/>
 				<include path="Pagarme_Pagarme::system/transaction/voucher.xml"/>
diff --git a/etc/adminhtml/system/marketplace.xml b/etc/adminhtml/system/marketplace.xml
index 7eaba6fe..79f31306 100644
--- a/etc/adminhtml/system/marketplace.xml
+++ b/etc/adminhtml/system/marketplace.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_pagarme_marketplace" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="50" translate="label">
+    <group id="pagarme_pagarme_marketplace" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="110" translate="label">
         <label>Marketplace</label>
         <field id="is_marketplace_disable" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="label">
             <frontend_model>Pagarme\Pagarme\Block\Adminhtml\System\Config\Form\Field\MarketplaceMessage</frontend_model>
diff --git a/etc/adminhtml/system/recurrence.xml b/etc/adminhtml/system/recurrence.xml
index fe8cf91b..d1194b69 100644
--- a/etc/adminhtml/system/recurrence.xml
+++ b/etc/adminhtml/system/recurrence.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_recurrence" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="40" translate="label">
-        <label>Recurrence Settings (Beta)</label>
+    <group id="pagarme_recurrence" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="100" translate="label">
+        <label>Recurrence Settings</label>
         <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="select">
             <label>Enable this Solution</label>
             <comment />
diff --git a/etc/adminhtml/system/transaction/billet.xml b/etc/adminhtml/system/transaction/billet.xml
index 63b22fb2..a0ffe368 100644
--- a/etc/adminhtml/system/transaction/billet.xml
+++ b/etc/adminhtml/system/transaction/billet.xml
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_billet" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+    <group id="pagarme_billet" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="40">
         <label>Boleto</label>
 	    <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="select">
 	        <label>Enable this payment method</label>
diff --git a/etc/adminhtml/system/transaction/debit.xml b/etc/adminhtml/system/transaction/debit.xml
index d75b6fe4..4484d81e 100644
--- a/etc/adminhtml/system/transaction/debit.xml
+++ b/etc/adminhtml/system/transaction/debit.xml
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_debit" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+    <group id="pagarme_debit" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="90">
         <label>Debit Card</label>
         <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Fieldset\DebitCardFieldset</frontend_model>
         <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
diff --git a/etc/adminhtml/system/transaction/googlepay.xml b/etc/adminhtml/system/transaction/googlepay.xml
new file mode 100644
index 00000000..f55127d1
--- /dev/null
+++ b/etc/adminhtml/system/transaction/googlepay.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" ?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+	
+    <group id="pagarme_googlepay" showInWebsite="1" showInStore="1" showInDefault="1" translate="label"  sortOrder="50">
+        <label>Google Pay</label>
+        <field id="active" type="select" sortOrder="10" showInWebsite="1" showInStore="1" showInDefault="1" translate="label">
+            <label>Enable this payment method</label>
+            <config_path>payment/pagarme_googlepay/active</config_path>
+            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+        </field>
+        <field id="title" type="text" sortOrder="20" showInWebsite="1" showInStore="1" showInDefault="1" translate="label">
+            <label>Payment label</label>
+            <config_path>payment/pagarme_googlepay/title</config_path>
+        </field>
+        <field id="merchant_id" type="text" sortOrder="30" showInWebsite="1" showInStore="1" showInDefault="1" translate="label, comment">
+            <label>MerchantId Google Pay</label>
+            <comment><![CDATA[Google Pay identifier required to create successful orders, find out how to request <a target='_blank' href='https://pay.google.com/business/console/?hl=pt-br'>here</a>.]]></comment>
+            <config_path>payment/pagarme_googlepay/merchant_id</config_path>
+        </field>
+        <field id="merchant_name" type="text" sortOrder="40" showInWebsite="1" showInStore="1" showInDefault="1" translate="label, tooltip">
+            <label>Store name on Google Pay</label>
+            <config_path>payment/pagarme_googlepay/merchant_name</config_path>
+            <tooltip>Name of your store that will be displayed to the customer while purchasing through Google Pay.</tooltip>
+        </field>
+        <field id="sort_order" type="text" sortOrder="50" showInWebsite="1" showInStore="1" showInDefault="1" translate="label">
+            <label>Payment method order</label>
+            <config_path>payment/pagarme_googlepay/sort_order</config_path>
+        </field>
+    </group>
+</config>
\ No newline at end of file
diff --git a/etc/adminhtml/system/transaction/multipleactionscreditcardbillet.xml b/etc/adminhtml/system/transaction/multipleactionscreditcardbillet.xml
index 84775552..3f7456b2 100644
--- a/etc/adminhtml/system/transaction/multipleactionscreditcardbillet.xml
+++ b/etc/adminhtml/system/transaction/multipleactionscreditcardbillet.xml
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_multipleactionscreditcardbillet" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+    <group id="pagarme_multipleactionscreditcardbillet" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="70">
         <label>Multi-means Credit Card and Boleto</label>
         <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
             <label>Enable this payment method</label>
diff --git a/etc/adminhtml/system/transaction/multipleactionstwocreditcard.xml b/etc/adminhtml/system/transaction/multipleactionstwocreditcard.xml
index 760ab2bc..bf016756 100644
--- a/etc/adminhtml/system/transaction/multipleactionstwocreditcard.xml
+++ b/etc/adminhtml/system/transaction/multipleactionstwocreditcard.xml
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_multipleactionstwocreditcard" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+    <group id="pagarme_multipleactionstwocreditcard" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="60">
         <label>Multi-means Double Credit Card</label>
         <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
             <label>Enable this payment method</label>
diff --git a/etc/adminhtml/system/transaction/pix.xml b/etc/adminhtml/system/transaction/pix.xml
index eb3a08eb..653c33fe 100644
--- a/etc/adminhtml/system/transaction/pix.xml
+++ b/etc/adminhtml/system/transaction/pix.xml
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_pix" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+    <group id="pagarme_pix" translate="label comment" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="30">
         <label>Pix</label>
 	    <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="select">
 	        <label>Enable this payment method</label>
diff --git a/etc/adminhtml/system/transaction/voucher.xml b/etc/adminhtml/system/transaction/voucher.xml
index 04c146ff..712759cf 100644
--- a/etc/adminhtml/system/transaction/voucher.xml
+++ b/etc/adminhtml/system/transaction/voucher.xml
@@ -6,7 +6,7 @@
  */
 -->
 <include xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_include.xsd">
-    <group id="pagarme_voucher" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="20">
+    <group id="pagarme_voucher" translate="label" showInDefault="1" showInWebsite="1" showInStore="1" sortOrder="80">
         <label>Voucher</label>
         <frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Fieldset\VoucherFieldset</frontend_model>
         <field id="active" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="10" translate="label" type="select">
diff --git a/etc/config.xml b/etc/config.xml
index 7e7867cc..17494609 100755
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -9,7 +9,7 @@
         </pagarme>
         <payment>
             <pagarme_billet>
-                <active>1</active>
+                <active>0</active>
                 <model>PagarmeBilletRemoteMethodAdapter</model>
                 <order_status>pending_payment</order_status>
                 <payment_action>authorize</payment_action>
@@ -25,7 +25,7 @@
             </pagarme_billet>
 
             <pagarme_pix>
-                <active>1</active>
+                <active>0</active>
                 <model>PagarmePixRemoteMethodAdapter</model>
                 <order_status>pending_payment</order_status>
                 <payment_action>authorize</payment_action>
@@ -41,7 +41,7 @@
             </pagarme_pix>
 
             <pagarme_creditcard>
-                <active>1</active>
+                <active>0</active>
                 <model>PagarmeCreditCardsRemoteMethodAdapter</model>
                 <order_status>pending_payment</order_status>
                 <payment_action>authorize_capture</payment_action>
@@ -118,7 +118,7 @@
             </pagarme_creditcard>
 
             <pagarme_billet_creditcard>
-                <active>1</active>
+                <active>0</active>
                 <model>PagarmeBilletCreditCardsRemoteMethodAdapter</model>
                 <order_status>pending_payment</order_status>
                 <payment_action>authorize</payment_action>
@@ -145,7 +145,7 @@
             </pagarme_billet_creditcard>
 
             <pagarme_two_creditcard>
-                <active>1</active>
+                <active>0</active>
                 <model>PagarmeTwoCreditCardRemoteMethodAdapter</model>
                 <order_status>pending_payment</order_status>
                 <payment_action>authorize</payment_action>
@@ -172,7 +172,7 @@
             </pagarme_two_creditcard>
 
             <pagarme_voucher>
-                <active>1</active>
+                <active>0</active>
                 <model>PagarmeVoucherRemoteMethodAdapter</model>
                 <order_status>pending_payment</order_status>
                 <payment_action>authorize_capture</payment_action>
@@ -199,7 +199,7 @@
             </pagarme_voucher>
 
             <pagarme_debit>
-                <active>1</active>
+                <active>0</active>
                 <model>PagarmeDebitRemoteMethodAdapter</model>
                 <order_status>pending_payment</order_status>
                 <payment_action>authorize_capture</payment_action>
@@ -223,6 +223,22 @@
                 <can_initialize>1</can_initialize>
                 <allow_multiple_address>0</allow_multiple_address>
             </pagarme_debit>
+
+            <pagarme_googlepay>
+                <active>0</active>
+                <model>PagarmeGooglePayRemoteMethodAdapter</model>
+                <order_status>pending_payment</order_status>
+                <payment_action>authorize</payment_action>
+                <title>Google Pay</title>
+                <can_initialize>1</can_initialize>
+                <can_authorize>1</can_authorize>
+                <can_capture>1</can_capture>
+                <can_use_checkout>1</can_use_checkout>
+                <can_use_internal>1</can_use_internal>
+                <is_gateway>1</is_gateway>
+                <sort_order>1</sort_order>
+                <can_initialize>1</can_initialize>
+            </pagarme_googlepay>
         </payment>
     </default>
-</config>
+</config>
\ No newline at end of file
diff --git a/etc/csp_whitelist.xml b/etc/csp_whitelist.xml
index b48ccb32..63a48b11 100644
--- a/etc/csp_whitelist.xml
+++ b/etc/csp_whitelist.xml
@@ -7,18 +7,38 @@
             <values>
                 <value id="mundipagg-api" type="host">api.mundipagg.com</value>
                 <value id="pagarme-api" type="host">api.pagar.me</value>
+                <value id="pagarme-brasil-api" type="host">brasilapi.com.br</value>
+                <value id="pagarme-viacep-api" type="host">viacep.com.br</value>
+                <value id="pagarme-ibge-api" type="host">servicodados.ibge.gov.br</value>
+                <value id="pagarme-googlepay" type="host">*.google.com</value>
+                <value id="pagarme-googlepay-google" type="host">google.com</value>
+                <value id="pagarme-googlepay-sandbox" type="host">pay.sandbox.google.com</value>
             </values>
         </policy>
         <policy id="img-src">
             <values>
                 <value id="mundipagg-img" type="host">cdn.mundipagg.com</value>
                 <value id="pagarme-img" type="host">api.pagar.me</value>
+                <value id="pagarme-googlepay" type="host">*.gstatic.com</value>
+            </values>
+        </policy>
+        <policy id="style-src">
+            <values>
+                <value id="pagarme-googlepayapis" type="host">*.googleapis.com</value>
+                <value id="pagarme-googlepay" type="host">*.google.com</value>
+            </values>
+        </policy>
+        <policy id="font-src">
+            <values>
+                <value id="pagarme-googlepay" type="host">*.google.com</value>
+                <value id="pagarme-googlepay-gstatic" type="host">*.gstatic.com</value>
             </values>
         </policy>
         <policy id="script-src">
             <values>
                 <value id="pagarme-api-3ds" type="host">3ds2.pagar.me</value>
                 <value id="pagarme-api-3ds-sdx" type="host">3ds2-sdx.pagar.me</value>
+                <value id="pagarme-googlepay" type="host">*.google.com</value>
             </values>
         </policy>
         <policy id="frame-src">
@@ -61,6 +81,7 @@
                 <value id="pagarme-tds-wise" type="host">*.wise.com</value>
                 <value id="pagarme-tds-revolut" type="host">*.revolut.com</value>
                 <value id="pagarme-tds-sandbox" type="host">*.sandbox.3dsecure.io</value>
+                <value id="pagarme-googlepay" type="host">*.google.com</value>
             </values>
         </policy>
         <policy id="form-action">
@@ -103,6 +124,7 @@
                 <value id="pagarme-tds-wise" type="host">*.wise.com</value>
                 <value id="pagarme-tds-revolut" type="host">*.revolut.com</value>
                 <value id="pagarme-tds-sandbox" type="host">*.sandbox.3dsecure.io</value>
+                <value id="pagarme-googlepay" type="host">*.google.com</value>
             </values>
         </policy>
     </policies>
diff --git a/etc/db_schema.xml b/etc/db_schema.xml
index bd27c3f8..8b3f85fc 100644
--- a/etc/db_schema.xml
+++ b/etc/db_schema.xml
@@ -22,7 +22,7 @@
         <column name="code" nullable="false" xsi:type="varchar" comment="Code" length="100"/>
         <column name="pagarme_id" nullable="false" xsi:type="varchar" comment="Pagarme Id" length="20"/>
     </table>
-    <table name="pagarme_module_core_recurrence_products_subscription" resource="default" engine="innodb" comment="Pagarme Recurrence Products Subscription Table">
+    <table name="pagarme_module_core_recurrence_products_subscription" resource="default" engine="innodb" comment="Pagar.me Recurrence Products Subscription Table">
         <column xsi:type="bigint" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Entity Id"/>
         <column name="product_id" nullable="true" xsi:type="int" padding="11" comment="Product Id" identity="false"/>
         <column name="credit_card" nullable="false" xsi:type="varchar" comment="Credit Card" length="1"/>
@@ -36,7 +36,7 @@
             <column name="id"/>
         </constraint>
     </table>
-    <table name="pagarme_module_core_recurrence_subscription_repetitions" resource="default" engine="innodb" comment="Pagarme Recurrence Subscription Repetitions Table">
+    <table name="pagarme_module_core_recurrence_subscription_repetitions" resource="default" engine="innodb" comment="Pagar.me Recurrence Subscription Repetitions Table">
         <column xsi:type="bigint" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="Entity Id"/>
         <column name="subscription_id" nullable="false" xsi:type="int" padding="11" comment="Subscription Id" identity="false"/>
         <column name="interval" nullable="false" xsi:type="varchar" comment="Interval" length="15"/>
@@ -50,7 +50,7 @@
             <column name="id"/>
         </constraint>
     </table>
-    <table name="pagarme_module_core_recurrence_products_plan" resource="default" engine="innodb" comment="Pagarme Recurrence Products Plan Table">
+    <table name="pagarme_module_core_recurrence_products_plan" resource="default" engine="innodb" comment="Pagar.me Recurrence Products Plan Table">
         <column xsi:type="int" name="id" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
         <column name="interval_type" nullable="false" xsi:type="varchar" comment="Day, week, month or year" length="15"/>
         <column name="interval_count" nullable="false" xsi:type="smallint" comment="Interval Count" padding="6" identity="false"/>
@@ -71,4 +71,19 @@
             <column name="id"/>
         </constraint>
     </table>
+    <table name="pagarme_module_core_recipients" resource="default" engine="innodb" comment="Pagar.me Marketplace Recipients">
+        <column name="id" xsi:type="int" padding="10" unsigned="true" nullable="false" identity="true" comment="ID"/>
+        <column name="external_id" xsi:type="int" nullable="false" comment="Webkul vendor ID"/>
+        <column name="pagarme_id" xsi:type="varchar" length="255" nullable="true" comment="Pagar.me ID (format: rp_xxxxxxxxxxxxxxxx)"/>
+        <column name="document_type" xsi:type="varchar" length="11" nullable="false" comment="Recipient document type: individual (CPF) or corporation (CNPJ)"/>
+        <column name="document" xsi:type="varchar" length="18" nullable="false" comment="Recipient document number"/>
+        <column name="name" xsi:type="varchar" length="255" nullable="false" comment="Recipient name"/>
+        <column name="email" xsi:type="varchar" length="255" nullable="false" comment="Recipient email"/>
+        <column name="status" xsi:type="varchar" length="50" nullable="true" comment="Recipient withdrawal status on Pagar.me"/>
+        <column name="created_at" xsi:type="timestamp" nullable="false" default="CURRENT_TIMESTAMP" comment="Created At"/>
+        <column name="updated_at" xsi:type="timestamp" nullable="false" default="CURRENT_TIMESTAMP" on_update="true" comment="Updated At"/>
+        <constraint xsi:type="primary" referenceId="PRIMARY">
+            <column name="id"/>
+        </constraint>
+    </table>
 </schema>
diff --git a/etc/db_schema_whitelist.json b/etc/db_schema_whitelist.json
index a4eeac8a..de9cef7f 100644
--- a/etc/db_schema_whitelist.json
+++ b/etc/db_schema_whitelist.json
@@ -79,5 +79,22 @@
         "constraint": {
             "PRIMARY": true
         }
+    },
+    "pagarme_module_core_recipients": {
+        "column": {
+            "id": true,
+            "external_id": true,
+            "pagarme_id": true,
+            "document_type": true,
+            "document": true,
+            "name": true,
+            "email": true,
+            "status": true,
+            "created_at": true,
+            "updated_at": true
+        },
+        "constraint": {
+            "PRIMARY": true
+        }
     }
 }
diff --git a/etc/di.xml b/etc/di.xml
index 58f903e4..a85d708a 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -20,6 +20,7 @@
     <preference for="Pagarme\Pagarme\Gateway\Transaction\CreditCard\Config\ConfigInterface" type="Pagarme\Pagarme\Gateway\Transaction\CreditCard\Config\Config" />
     <preference for="Pagarme\Pagarme\Gateway\Transaction\DebitCard\Config\ConfigInterface" type="Pagarme\Pagarme\Gateway\Transaction\DebitCard\Config\Config" />
     <preference for="Pagarme\Pagarme\Gateway\Transaction\TwoCreditCard\Config\ConfigInterface" type="Pagarme\Pagarme\Gateway\Transaction\TwoCreditCard\Config\Config" />
+    <preference for="Pagarme\Pagarme\Gateway\Transaction\GooglePay\Config\ConfigInterface" type="Pagarme\Pagarme\Gateway\Transaction\GooglePay\Config\Config" />
     <preference for="Pagarme\Pagarme\Gateway\Transaction\Billet\Config\ConfigInterface" type="Pagarme\Pagarme\Gateway\Transaction\Billet\Config\Config" />
     <preference for="Pagarme\Pagarme\Gateway\Transaction\BilletCreditCard\Config\ConfigInterface" type="Pagarme\Pagarme\Gateway\Transaction\BilletCreditCard\Config\Config" />
     <preference for="Pagarme\Pagarme\Api\BilletCreditCardRequestDataProviderInterface" type="Pagarme\Pagarme\Gateway\Transaction\BilletCreditCard\ResourceGateway\Create\RequestDataProvider" />
@@ -213,6 +214,60 @@
         </arguments>
     </type>
 
+    <!-- GooglePay -->
+    <virtualType name="PagarmeGooglePayRemoteMethodAdapter" type="Magento\Payment\Model\Method\Adapter">
+        <arguments>
+            <argument name="code" xsi:type="const">Pagarme\Pagarme\Model\Ui\GooglePay\ConfigProvider::CODE</argument>
+            <argument name="valueHandlerPool" xsi:type="object">PagarmeGooglePayValueHandlerPool</argument>
+            <argument name="commandPool" xsi:type="object">PagarmeGooglePayCommandPool</argument>
+            <argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
+            <argument name="infoBlockType" xsi:type="string">Pagarme\Pagarme\Block\Payment\Info\GooglePay</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="PagarmeGooglePayCommandResponseHandlerPool" type="Magento\Payment\Gateway\Response\HandlerChain">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="general" xsi:type="string">Pagarme\Pagarme\Gateway\Transaction\GooglePay\ResourceGateway\Create\Response\GeneralHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="PagarmeGooglePayAuthorizeCommand" type="Pagarme\Pagarme\Gateway\Transaction\Base\Command\AuthorizeCommand">
+        <arguments>
+            <argument name="requestBuilder" xsi:type="object">Pagarme\Pagarme\Gateway\Transaction\GooglePay\ResourceGateway\Create\RequestBuilder</argument>
+            <argument name="responseHandler" xsi:type="object">PagarmeGooglePayCommandResponseHandlerPool</argument>
+            <argument name="validator" xsi:type="object">Pagarme\Pagarme\Gateway\Transaction\GooglePay\ResourceGateway\Create\Response\Validator</argument>
+        </arguments>
+    </virtualType>
+    <virtualType name="PagarmeGooglePayValueHandlerPool" type="Magento\Payment\Gateway\Config\ValueHandlerPool">
+        <arguments>
+            <argument name="handlers" xsi:type="array">
+                <item name="default" xsi:type="string">PagarmeGooglePayConfigValueHandler</item>
+            </argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="PagarmeGooglePayConfigValueHandler" type="Magento\Payment\Gateway\Config\ConfigValueHandler">
+        <arguments>
+            <argument name="configInterface" xsi:type="object">PagarmeGooglePayConfig</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="PagarmeGooglePayConfig" type="Magento\Payment\Gateway\Config\Config">
+        <arguments>
+            <argument name="methodCode" xsi:type="const">Pagarme\Pagarme\Model\Ui\GooglePay\ConfigProvider::CODE</argument>
+        </arguments>
+    </virtualType>
+
+    <virtualType name="PagarmeGooglePayCommandPool" type="Magento\Payment\Gateway\Command\CommandPool">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="initialize" xsi:type="string">Pagarme\Pagarme\Gateway\Transaction\Base\Command\InitializeCommand</item>
+                <item name="authorize" xsi:type="string">PagarmeGooglePayAuthorizeCommand</item>
+            </argument>
+        </arguments>
+    </virtualType>
+    <!-- GooglePay -->
+
     <!-- Pix -->
     <virtualType name="PagarmePixRemoteMethodAdapter" type="Magento\Payment\Model\Method\Adapter">
         <arguments>
@@ -749,4 +804,5 @@
                 sortOrder="10"
                 disabled="false"/>
     </type>
+    <preference for="Pagarme\Pagarme\Api\KycLinkResponseInterface" type="Pagarme\Pagarme\Model\Api\KycLinkResponse"/>
 </config>
diff --git a/etc/events.xml b/etc/events.xml
index 159c8a46..18e83e56 100644
--- a/etc/events.xml
+++ b/etc/events.xml
@@ -18,6 +18,9 @@
     <event name="payment_method_assign_data_pagarme_pix">
         <observer name="pagarme_payment_method_assign_data_pagarme_pix" instance="Pagarme\Pagarme\Observer\PixDataAssignObserver" />
     </event>
+    <event name="payment_method_assign_data_pagarme_googlepay">
+        <observer name="pagarme_payment_method_assign_data_pagarme_googlepay" instance="Pagarme\Pagarme\Observer\GooglePayDataAssignObserver" />
+    </event>
     <event name="sales_order_place_before">
         <observer name="pagarme_payment_sales_order_place_before_pagarme_creditcard" instance="Pagarme\Pagarme\Observer\CreditCardOrderPlaceBeforeObserver" />
         <observer name="pagarme_payment_sales_order_place_before" instance="Pagarme\Pagarme\Observer\OrderPlaceBeforeObserver" />
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index eed647e8..9c0abab2 100755
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -72,6 +72,7 @@
                 <item name="installments_creditcard" xsi:type="object">PagarmeCreditCardInstallmentsUiConfigProvider</item>
                 <item name="pagarme_billet_config_provider" xsi:type="object">Pagarme\Pagarme\Model\Ui\Billet\ConfigProvider</item>
                 <item name="pagarme_pix_config_provider" xsi:type="object">Pagarme\Pagarme\Model\Ui\Pix\ConfigProvider</item>
+                <item name="pagarme_googlepay_config_provider" xsi:type="object">Pagarme\Pagarme\Model\Ui\GooglePay\ConfigProvider</item>
                 <item name="pagarme_config_provider" xsi:type="object">Pagarme\Pagarme\Model\PagarmeConfigProvider</item>
             </argument>
         </arguments>
diff --git a/etc/module.xml b/etc/module.xml
index 07cf9f4c..2ae94da5 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -9,7 +9,7 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Pagarme_Pagarme" setup_version="2.4.2">
+    <module name="Pagarme_Pagarme" setup_version="2.5.0">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />
diff --git a/etc/payment.xml b/etc/payment.xml
index bc7f7ee0..a5a77b38 100644
--- a/etc/payment.xml
+++ b/etc/payment.xml
@@ -23,6 +23,9 @@
         <method name="pagarme_pix">
             <allow_multiple_address>1</allow_multiple_address>
         </method>
+        <method name="pagarme_googlepay">
+            <allow_multiple_address>1</allow_multiple_address>
+        </method>
         <method name='pagarme_customer_address'>
             <allow_multiple_address>0</allow_multiple_address>
         </method>
diff --git a/etc/webapi.xml b/etc/webapi.xml
index 89224aed..dce289ed 100755
--- a/etc/webapi.xml
+++ b/etc/webapi.xml
@@ -97,6 +97,14 @@
         </resources>
     </route>
 
+    <route url="/V1/pagarme/marketplace/recipient/kyc/link/:id" method="GET">
+        <service class="Pagarme\Pagarme\Api\RecipientInterface"
+                 method="createKycLink"/>
+        <resources>
+            <resource ref="anonymous"/>
+        </resources>
+    </route>
+
     <route url="/V1/pagarme/recurrence/product" method="POST">
         <service class="Pagarme\Pagarme\Api\ProductSubscriptionApiInterface"
                  method="save"/>
diff --git a/i18n/pt_BR.csv b/i18n/pt_BR.csv
index 49335d9c..81dcae63 100644
--- a/i18n/pt_BR.csv
+++ b/i18n/pt_BR.csv
@@ -16,7 +16,7 @@
 "Multi-means Double Credit Card","Multimeios Dois Cartões de Crédito"
 "Multi-means Credit Card and Boleto","Multimeios Cartão de Crédito e Boleto"
 "Debit Card","Cartão de Débito"
-"Recurrence Settings (Beta)","Configurações de Recorrência (Beta)"
+"Recurrence Settings","Configurações de Recorrência"
 "Show Recurrence Currency Widget","Mostrar Widget de Moeda de Recorrência"
 "Conflict checkout message","Mensagem de Conflito do Checkout"
 "Print Billet","Imprimir Boleto"
@@ -300,7 +300,7 @@
 "Customer Id", "Identificação do Cliente"
 "Card Id", "Identificação do Cartão"
 "Confirm action", "Confirmar ação"
-"Are you sure you want to delete this item?", "Você tem certeza que deseja deletar este item"
+"Are you sure you want to delete this item?", "Você tem certeza que deseja deletar este item?"
 "Product plan not exist.", "Produto plano não existe"
 "Edit Plan", "Editar plano"
 "Create Plan", "Criar plano"
@@ -402,6 +402,7 @@
 "<p><strong style='color:red'>Warning!</strong> Don't forget to add your store's domain on Pagar.me dashboard</p>", "<p><strong style='color:red'>Aviso!</strong> Não se esqueça de adicionar o domínio da sua loja no painel do Pagar.me</p>"
 "View Integration", "Ver Integração"
 "Integrate With Pagar.me", "Integrar com Pagar.me"
+"Access Pagar.me Dash","Acessar a Dash Pagar.me"
 "Important!","Importante!"
 "This store is linked to the Pagar.me test environment. This environment is intended for integration validation and does not generate real financial transactions.","Esta loja está vinculada ao ambiente de testes da Pagar.me. Este ambiente é destinado a validação de integração e não gera operações financeiras reais."
 "<b>Show VAT Number on Storefront</b> must be defined as <b>&quot;Yes&quot;</b> on <b>Stores</b> > <b>Configuration</b> > <b>Customers</b> > <b>%sCustomer Configuration%s</b> > <b>Create New Account Options</b> for Pagar.me module to work on your store.","<b>Mostrar Número VAT na Vitrine</b> deve ser definido como <b>&quot;Sim&quot;</b> em <b>Lojas</b> > <b>Configuração</b> > <b>Clientes</b> > <b>%sConfigurações de cliente%s</b> > <b>Criar Novas Opções de Conta</b> para que o módulo da Pagar.me funcione na sua loja."
@@ -422,8 +423,33 @@
 "Responsibility for chargebacks","Responsabilidade pelos chargebacks"
 "Responsibility for receiving split remainder","Responsabilidade pelo recebimento do restante da divisão"
 "Responsibility for receiving extras and discounts","Responsabilidade pelo recebimento de extras e descontos"
+"Pagar.me Recipient","Recebedor Pagar.me"
 "Marketplace main recipient","Recebedor Principal do Marketplace"
 "<p>Pagar.me recipient id that represents your marketplace</p>","<p>ID do recebedor Pagar.me que representa seu marketplace</p>"
+"View","Visualizar"
+"Edit","Editar"
+"Delete","Deletar"
+"External ID","ID Externo"
+"Pagar.me ID","ID Pagar.me"
+"Error!","Erro!"
+"Recipient registered successfully!","Recebedor cadastrado com sucesso!"
+"Recipient had their status updated successfully.","Recebedor teve seu status atualizado com sucesso."
+"Status updated!","Status atualizado!"
+
+"<p>He can now sell, but remember to check his <b>status</b>. He can only withdraw his sales amounts once the status is <i>“active”</i></p>","<p>Ele já consegue vender, mas lembre-se de verificar o <b>status</b>. Ele só poderá sacar os valores de suas vendas quando o status estiver <i>“ativo”</i>.</p>"
+"<p>Follow the status on <b>Pagar.me > Recipients</b> to activate this recipient's balance movement soon!</p>","<p>Acompanhe o status em <b>Pagar.me > Recebedores</b> para ativar a movimentação de saldo deste recebedor em breve!</p>"
+"To activate your balance movement on Pagar.me, complete our <b>security validation</b>.","Para ativar sua movimentação de saldo no Pagar.me, complete nossa <b>validação de segurança</b>."
+"<span class='pagarme-alert-text'>Attention!</span> The generated link will be valid for 20 minutes.", "<span class='pagarme-alert-text'>Atenção!</span> O link gerado será válido por 20 minutos."
+
+"Start validation","Iniciar validação"
+"Point the smartphone camera to scan the QRCode.","Aponte a câmera do celular para ler o QRCode."
+"Or use this %slink%s.","Ou utilize este %slink%s."
+"An error occurred while saving the recipient.","Ocorreu um erro ao salvar o recebedor."
+"Bank account holder name must be lower than 30 characters.","O nome do titular da conta bancária deve ter menos de 30 caracteres."
+"Recipient not active.","Recebedor não está ativo."
+"Recipient found.","Recebedor encontrado."
+"Recipient deleted.","Recebedor excluído."
+"Invalid email.","Email inválido."
 "Get info","Obter info"
 "Marketplace and Sellers","Marketplace e Vendedores"
 "Sellers","Vendedores"
@@ -431,14 +457,37 @@
 "Name","Nome"
 "Add New Recipient","Adicionar Novo Recebedor"
 "Recipient not found.","Recebedor não encontrado."
-"Select webkul seller","Selecione o vendedor do webkul"
+"Seller information","Informações do recebedor"
+"Select Webkul seller","Selecione o vendedor do Webkul"
 "Search","Pesquisar"
 "Create","Criar"
-"Use an existing Pagar.me recipient","Usar um recipiente existente na Pagar.me"
-"External ID","ID externo"
+"Webkul ID","ID Webkul"
+"Site URL","URL do site"
+"Phone numbers","Números de telefones"
+"Contact type","Tipo de contato"
+"Telephone","Telefone"
+"Contact number","Número de contato"
 "Document type","Tipo do documento"
-"Document number","Número do documento"
+"Document number", "Número do documento"
+"Personal data","Dados pessoais"
+"Company data","Dados da empresa"
+"Company address","Endereço da empresa"
+"Mother name","Nome da mãe"
+"Date of birth","Data de nascimento"
+"Monthly income","Renda mensal"
+"Profession","Profissão"
+"Reference point","Ponto de referência"
+"Trading name","Nome fantasia"
+"Annual revenue","Faturamento anual"
+"Founding date","Data de fundação"
+"Company type","Tipo da empresa"
+"Company name","Razão social"
+"Managing partner","Sócio administrador"
+"Managing partner phone numbers","Números de telefones do sócio administrador"
+"Managing partner address","Endereço do sócio administrador"
 "Banking information","Informações de banco"
+"The bank account holder must be the recipient (same document number).","O titular da conta bancária deve ser o recebedor (mesmo número de documento)."
+"Use an existing Pagar.me recipient","Usar um recebedor existente na Pagar.me"
 "Holder name","Nome do titular"
 "Bank code","Código do banco"
 "Branch number","Número da agência"
@@ -458,6 +507,7 @@
 "Weekly","Semanalmente"
 "Monthly","Mensalmente"
 "Create Recipient","Criar Recebedor"
+"Recipient","Recebedor"
 "Save","Salvar"
 "Back","Voltar"
 "Can't create recipient. Please review the information and try again.","Não foi possível criar o recebedor. Por favor revise os dados e tente novamente."
@@ -545,3 +595,18 @@
 "U - Authentication unavailable","U - Autenticação indisponível"
 "N - Transaction rejected by the Issuer","N - Transação rejeitada pelo Emissor"
 "R - Transaction rejected by Issuer (post-challenge)","R - Transação rejeitada pelo Emissor (pós-desafio)"
+"Registered","Cadastrado"
+"Validation Requested","Validação Solicitada"
+"Waiting For Analysis","Aguardando Análise"
+"Approved","Aprovado"
+"Disapproved","Reprovado"
+"Suspended","Suspenso"
+"Blocked","Bloqueado"
+"Inactive","Inativo"
+"Recipient not founded.","Recebedor não encontrado."
+"Failed to generate the security validation link.","Falha ao gerar o link de validação de segurança."
+"Something went wrong, please try again later.","Algo deu errado, por favor tente novamente mais tarde."
+"Google Pay identifier required to create successful orders, find out how to request <a target='_blank' href='https://pay.google.com/business/console/?hl=pt-br'>here</a>.", "Identificador do Google Pay necessário para criação de pedidos com sucesso, saiba como solicitar <a target='_blank' href='https://pay.google.com/business/console/?hl=pt-br'>aqui</a>."
+"MerchantId Google Pay", "MerchantId Google Pay"
+"Store name on Google Pay", "Nome da loja no Google Pay"
+"Name of your store that will be displayed to the customer while purchasing through Google Pay.", "Nome da sua loja que será exibida ao cliente durante a compra pelo Google Pay."
diff --git a/view/adminhtml/layout/pagarme_pagarme_plans_create.xml b/view/adminhtml/layout/pagarme_pagarme_plans_create.xml
index e37a61f2..b8414ec6 100755
--- a/view/adminhtml/layout/pagarme_pagarme_plans_create.xml
+++ b/view/adminhtml/layout/pagarme_pagarme_plans_create.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 	<head>
-		<css src="Pagarme_Pagarme::css/jquery-ui.min.css" />
 		<css src="Pagarme_Pagarme::css/pagarme_style.css" />
 		<script src="Pagarme_Pagarme::js/recurrence.js"/>
 	</head>
diff --git a/view/adminhtml/layout/pagarme_pagarme_recipients_create.xml b/view/adminhtml/layout/pagarme_pagarme_recipients_create.xml
index 1f51685f..19ab475e 100644
--- a/view/adminhtml/layout/pagarme_pagarme_recipients_create.xml
+++ b/view/adminhtml/layout/pagarme_pagarme_recipients_create.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
-        <css src="Pagarme_Pagarme::css/jquery-ui.min.css" />
         <css src="Pagarme_Pagarme::css/pagarme_style.css" />
         <script src="Pagarme_Pagarme::js/recipients.js" />
     </head>
diff --git a/view/adminhtml/layout/pagarme_pagarme_recipients_index.xml b/view/adminhtml/layout/pagarme_pagarme_recipients_index.xml
index 35d1cdb3..6dc2e482 100644
--- a/view/adminhtml/layout/pagarme_pagarme_recipients_index.xml
+++ b/view/adminhtml/layout/pagarme_pagarme_recipients_index.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" ?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
-    <update handle="styles"/>
+    <head>
+        <css src="Pagarme_Pagarme::css/pagarme_style.css" />
+    </head>
     <body>
         <referenceContainer name="content">
             <uiComponent name="pagarme_pagarme_recipients_listing"/>
diff --git a/view/adminhtml/layout/pagarme_pagarme_recurrenceproducts_create.xml b/view/adminhtml/layout/pagarme_pagarme_recurrenceproducts_create.xml
index 8645287d..978d0344 100755
--- a/view/adminhtml/layout/pagarme_pagarme_recurrenceproducts_create.xml
+++ b/view/adminhtml/layout/pagarme_pagarme_recurrenceproducts_create.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 	<head>
-		<css src="Pagarme_Pagarme::css/jquery-ui.min.css" />
 		<css src="Pagarme_Pagarme::css/pagarme_style.css" />
 		<script src="Pagarme_Pagarme::js/recurrence.js"/>
 	</head>
diff --git a/view/adminhtml/layout/pagarme_pagarme_subscriptions_details.xml b/view/adminhtml/layout/pagarme_pagarme_subscriptions_details.xml
index 0ebcf7ee..db78499a 100755
--- a/view/adminhtml/layout/pagarme_pagarme_subscriptions_details.xml
+++ b/view/adminhtml/layout/pagarme_pagarme_subscriptions_details.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" ?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
 	<head>
-		<css src="Pagarme_Pagarme::css/jquery-ui.min.css" />
 		<css src="Pagarme_Pagarme::css/pagarme_style.css" />
 	</head>
 	<body>
diff --git a/view/adminhtml/requirejs-config.js b/view/adminhtml/requirejs-config.js
index ea043711..4d78b889 100644
--- a/view/adminhtml/requirejs-config.js
+++ b/view/adminhtml/requirejs-config.js
@@ -2,7 +2,8 @@ const config = {
     map: {
         '*': {
             orderCharge: 'Pagarme_Pagarme/js/view/order/orderCharge',
-            creditCardAdminPagarme: 'Pagarme_Pagarme/js/view/form/creditCard'
+            creditCardAdminPagarme: 'Pagarme_Pagarme/js/view/form/creditCard',
+            pagarmeJqueryMask: 'Pagarme_Pagarme/js/jquery.mask.min'
         }
     }
 }
diff --git a/view/adminhtml/templates/info/card.phtml b/view/adminhtml/templates/info/card.phtml
new file mode 100644
index 00000000..0cc47db3
--- /dev/null
+++ b/view/adminhtml/templates/info/card.phtml
@@ -0,0 +1,53 @@
+<?php
+    /**
+     * @var \Pagarme\Core\Kernel\Aggregates\Transaction $info
+     */
+    $info =  $this->getTransactionInfo();
+?>
+<span>
+    <?= __($this->getTitle()); ?>
+</span>
+<br /><br />
+<span>
+    <b><?= __('Brand'); ?>: </b>
+    <?= $info['cardBrand'] ?>
+</span><br />
+<span>
+    <b><?= __('Number'); ?>: </b>
+    <?= $info['lastFour']; ?>
+</span>
+<br />
+<?php if (!empty($info['installments'])) : ?>
+    <span>
+        <b><?= __('Installments'); ?>: </b>
+        <?= $info['installments'] ?>
+    </span>
+<?php endif; ?>
+<?php if (!empty($info['authorized'])) : ?>
+    <br />
+    <span>
+        <b><?= __('NSU'); ?>: </b>
+        <?= $info['authorized']; ?>
+    </span>
+<?php endif; ?>
+<br />
+<?php if (!empty($info['captured'])) : ?>
+    <br />
+    <span><b><?= __('NSU from capture'); ?>: </b><?= $info['captured']; ?></span>
+<?php endif; ?>
+<?php if (!empty($info['tid'])) : ?>
+    <br />
+    <span>
+        <b><?= __('TID'); ?>: </b>
+        <?= $info['tid']; ?>
+    </span>
+<?php endif; ?>
+<?php if (!empty($info['3dsStatus'])) : ?>
+    <br />
+    <span>
+        <b><?= __('3DS Status'); ?>: </b>
+        <?= __($info['3dsStatus']); ?>
+    </span>
+<?php endif; ?>
+<br />
+<span><?= $info['acquirerMessage']; ?></span>
\ No newline at end of file
diff --git a/view/adminhtml/templates/info/creditCard.phtml b/view/adminhtml/templates/info/creditCard.phtml
deleted file mode 100644
index c0b2d9b1..00000000
--- a/view/adminhtml/templates/info/creditCard.phtml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php /* @var \Pagarme\Pagarme\Block\Payment\Info\CreditCard $this */ ?>
-<?php if ($this->getCcType()): ?>
-
-    <?php
-    /**
-     * @var \Pagarme\Core\Kernel\Aggregates\Transaction $lastTransaction
-     */
-    $lastTransaction =  $this->getTransactionInfo();
-    $threeDSStatus =  $this->getThreeDSStatus();
-    ?>
-    <span><?= __($this->getTitle()); ?></span>
-    <br/>
-    <br/>
-    <span><b><?= __('Brand'); ?>: </b><?= $this->getCcBrand(); ?></span>
-    <br/>
-    <span><b><?= __('Number'); ?>: </b><?= $this->getCardLast4(); ?></span>
-    <br/>
-    <span><b><?= __('Installments'); ?>: </b><?= $this->getInstallments(); ?></span>
-    <?php if (!empty($lastTransaction['authorized'])): ?>
-        <br/>
-        <span><b><?= __('NSU'); ?>: </b><?= $lastTransaction['authorized']; ?></span>
-    <?php endif; ?>
-    <br/>
-    <?php if (!empty($lastTransaction['captured'])): ?>
-        <br/>
-        <span><b><?= __('NSU from capture'); ?>: </b><?= $lastTransaction['captured']; ?></span>
-    <?php endif; ?>
-    <?php if (!empty($lastTransaction['tid'])): ?>
-        <br/>
-        <span><b><?= __('TID'); ?>: </b><?= $lastTransaction['tid']; ?></span>
-    <?php endif; ?>
-    <?php if (!empty($threeDSStatus)): ?>
-        <br/>
-        <span><b><?= __('3DS Status'); ?>: </b><?= __($threeDSStatus); ?></span>
-    <?php endif; ?>
-<?php endif ?>
diff --git a/view/adminhtml/templates/info/debit.phtml b/view/adminhtml/templates/info/debit.phtml
deleted file mode 100644
index 8fcdf3f8..00000000
--- a/view/adminhtml/templates/info/debit.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php /* @var \Pagarme\Pagarme\Block\Payment\Info\Debit $this */
-$threeDSStatus =  $this->getThreeDSStatus();
-?>
-<?php if ($this->getCardBrand()): ?>
-    <span><?= __($this->getTitle()); ?></span>
-    <br/>
-    <br/>
-    <span><b><?= __('Brand'); ?>: </b><?= $this->getCcBrand(); ?></span>
-    <br/>
-    <span><b><?= __('Number'); ?>: </b><?= $this->getCardLast4(); ?></span>
-    <?php if (!empty($threeDSStatus)): ?>
-        <br/>
-        <span><b><?= __('3DS Status'); ?>: </b><?= __($threeDSStatus); ?></span>
-    <?php endif; ?>
-<?php endif ?>
diff --git a/view/adminhtml/templates/marketplace/recipients/create.phtml b/view/adminhtml/templates/marketplace/recipients/create.phtml
index ab4d7da6..8b4fd375 100644
--- a/view/adminhtml/templates/marketplace/recipients/create.phtml
+++ b/view/adminhtml/templates/marketplace/recipients/create.phtml
@@ -1,14 +1,20 @@
-<form id="form-recipients" method="post">
+<?php $states = $block->getAllRegionsOfCountry();
+$editRecipient = $block->getEditRecipient(); ?>
+<form id="pagarme-recipients-form" method="post">
     <div class="page-main-actions">
         <div class="page-actions-placeholder"></div>
         <div class="page-actions" data-ui-id="page-actions-toolbar-content-header">
             <div class="page-actions-inner" data-title="New Recipient">
                 <div class="page-actions-buttons">
-                    <button id="save-button" title="Save" class="action-default primary" type="submit">
-                        <span><?php echo __('Save') ?></span>
-                    </button>
-                    <button id="back" title="Back" type="button" class="action- scalable back" onclick="location.href = '<?php echo $block->getUrl('pagarme_pagarme/recipients/index') ?>'" data-ui-id="back-button">
-                        <span><?php echo __('Back') ?></span>
+                    <?php if (!$editRecipient) : ?>
+                        <button id="save-button" title="Save" class="action-default primary" type="submit">
+                            <span><?= __('Save') ?></span>
+                        </button>
+                    <?php endif; ?>
+                    <button id="back" title="Back" type="button" class="action- scalable back"
+                            onclick="location.href = '<?= $block->getUrl('pagarme_pagarme/recipients/index') ?>'"
+                            data-ui-id="back-button">
+                        <span><?= __('Back') ?></span>
                     </button>
                 </div>
             </div>
@@ -16,16 +22,23 @@
     </div>
 
     <!-- Url Post-->
-    <input id="url-post" value="<?php echo $block->getBaseUrl() . 'rest/V1/pagarme/marketplace/recipient/formData'; ?>" type="hidden" />
-    <input id="url-search-recipient-id" value="<?php echo $block->getBaseUrl() . 'rest/V1/pagarme/marketplace/recipient/searchRecipient'; ?>" type="hidden" />
+    <input type="hidden" id="url-post"
+           value="<?= $block->getBaseUrl() . 'rest/V1/pagarme/marketplace/recipient/formData' ?>" tabindex="-1"/>
+    <input type="hidden" id="url-search-recipient-id"
+           value="<?= $block->getBaseUrl() . 'rest/V1/pagarme/marketplace/recipient/searchRecipient' ?>"
+           tabindex="-1"/>
+
+    <input type="hidden" name="form[status]" id="pagarme-status" value="" tabindex="-1"/>
+
+    <input type="hidden" name="form_key" value="<?= $block->getFormKey() ?>" tabindex="-1"/>
 
-    <input type="hidden" name="form_key" value="<?php echo $block->getFormKey() ?>" />
+    <input type="hidden" id="recipient-id-control" value="" tabindex="-1"/>
 
     <?php if (!empty($block->getRecipientId())) : ?>
         <!--  LocalId  -->
-        <input type="hidden" name="form[id]" value="<?php echo $block->getLocalId() ?>">
+        <input type="hidden" name="form[id]" value="<?= $block->getLocalId() ?>" tabindex="-1"/>
         <!--  RecipientId  -->
-        <input type="hidden" name="form[recipient_id]" value="<?php echo $block->getRecipientId() ?>">
+        <input type="hidden" name="form[recipient_id]" value="<?= $block->getRecipientId() ?>" tabindex="-1"/>
     <?php endif; ?>
 
     <div id="page:main-container" class="page-columns">
@@ -33,241 +46,928 @@
             <div id="container" class="main-col">
                 <div class="entry-edit form-inline">
                     <div class="fieldset-wrapper">
-                        <div class="admin__fieldset-wrapper-content _hide">
+                        <div class="admin__fieldset-wrapper-content">
                             <div class="admin__fieldset">
-                                <div class="admin__field" id="select-seller">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Select webkul seller') ?></span>
+
+                                <h2><?= __('Seller information') ?></h2>
+
+                                <div class="admin__field _required" id="webkul-seller-container">
+                                    <label for="webkul-seller" class="admin__field-label">
+                                        <span><?= __('Select Webkul seller') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[external_id]" id="select-webkul-seller">
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[register_information][webkul_seller]" id="webkul-seller"
+                                                autofocus required>
                                             <?php if (!empty($block->getSellers())) : ?>
-                                                <option value=""><?php echo __('Select a seller') ?></option>
-                                                <?php
-                                                foreach ($block->getSellers() as $seller) {
-                                                ?>
-                                                    <option sellername="<?php printf("%s %s", $seller['firstname'], $seller['lastname']); ?>" email="<?php echo $seller['email']; ?>" document="<?php echo !empty($seller['taxvat']) ? $seller['taxvat'] : ""; ?>" value="<?php echo $seller['entity_id'] ?>">
-                                                        <?php printf("%s %s (%s)", $seller['firstname'], $seller['lastname'], $seller['email']); ?>
+                                                <option value=""><?= __('Select a seller') ?></option>
+                                                <?php foreach ($block->getSellers() as $seller) : ?>
+                                                    <option
+                                                        data-sellername="<?php printf(
+                                                            "%s %s",
+                                                            $seller['firstname'],
+                                                            $seller['lastname']); ?>"
+                                                        data-email="<?= $seller['email'] ?>"
+                                                        data-document="<?= !empty($seller['taxvat']) ? $seller['taxvat'] : '' ?>"
+                                                        data-birthdate="<?= !empty($seller['dob']) ? $seller['dob'] : '' ?>"
+                                                        value="<?= $seller['entity_id'] ?>">
+                                                        <?php printf(
+                                                            '%s %s (%s)',
+                                                            $seller['firstname'],
+                                                            $seller['lastname'],
+                                                            $seller['email']
+                                                        ); ?>
                                                     </option>
-                                                <?php
-                                                }
-                                                ?>
+                                                <?php endforeach; ?>
                                             <?php endif; ?>
 
                                             <?php if (empty($block->getSellers())) : ?>
-                                                <option value=""><?php echo __('No valid sellers found.') ?></option>
+                                                <option value=""><?= __('No valid sellers found.') ?></option>
                                             <?php endif; ?>
-
-
                                         </select>
                                         <?php if (empty($block->getSellers())) : ?>
-                                            <button type="button" class="action-basic" onclick="location.href = '<?php echo $block->getUrl('customer/index/new') ?>'">
-                                                <span><?php echo __('Create') ?></span>
+                                            <button type="button" class="action-basic"
+                                                    onclick="location.href = '<?= $block->getUrl('customer/index/new') ?>'">
+                                                <span><?= __('Create') ?></span>
                                             </button>
                                         <?php endif; ?>
+                                    </div>
+                                </div>
 
-                                        <p id="error-message" class="error-message"></p>
+                                <div class="admin__field _required" data-section="seller">
+                                    <label for="webkul-id" class="admin__field-label">
+                                        <span><?= __('Webkul ID') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][external_id]" id="webkul-id" readonly
+                                               data-toggle-required>
                                     </div>
                                 </div>
 
-                                <div class="admin__field" id="use_existing_pagarme_id">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Use an existing Pagar.me recipient') ?></span>
+                                <div class="admin__field _required" id="use_existing_pagarme_id" data-section="seller">
+                                    <label for="existing_recipient" class="admin__field-label">
+                                        <span><?= __('Use an existing Pagar.me recipient') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[existing_recipient]" id="existing_recipient">
-                                            <option value="0"><?php echo __('No') ?></option>
-                                            <option value="1"><?php echo __('Yes') ?></option>
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[existing_recipient]"
+                                                id="existing_recipient" data-toggle-required>
+                                            <option value="0"><?= $block->getLabel('no') ?></option>
+                                            <option value="1"><?= $block->getLabel('yes') ?></option>
                                         </select>
                                     </div>
                                 </div>
 
-                                <div class="admin__field" id="pagarme_id">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('ID Pagar.me') ?></span>
+                                <div class="admin__field _required" id="pagarme_id" data-section="pagarme_id">
+                                    <label for="recipient-id" class="admin__field-label">
+                                        <span><?= __('ID Pagar.me') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" name="form[pagarme_id]" id="recipient-id">
-                                        <button type="button" class="action-basic" id="search-recipient-id" data-action="">
-                                            <span><?php echo __('Get info') ?></span>
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[pagarme_id]" id="recipient-id" data-toggle-required>
+                                        <button type="button" class="action-basic" id="search-recipient-id"
+                                                data-action="">
+                                            <span><?= __('Get info') ?></span>
                                         </button>
                                         <p id="error-message" class="error-message"></p>
                                     </div>
                                 </div>
 
-                                <div class="admin__field _required" id="external-id-div">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('External ID') ?></span>
+                                <div class="admin__field _required" data-section="seller">
+                                    <label for="document-type" class="admin__field-label">
+                                        <span><?= $block->getLabel('document_type') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[register_information][type]" id="document-type"
+                                                data-toggle-required>
+                                            <option value=""><?= $block->getLabel('select') ?></option>
+                                            <option value="individual"><?= __('CPF') ?></option>
+                                            <option value="corporation"><?= __('CNPJ') ?></option>
+                                        </select>
+                                    </div>
+                                </div>
+
+                                <?php if ($editRecipient) : ?>
+                                    <div class="admin__field _required">
+                                        <label for="status" class="admin__field-label">
+                                            <span><?= __('Status') ?></span>
+                                        </label>
+                                        <div class="admin__field-control">
+                                            <input type="text" value="" class="recipient-form-inputs" id="status-label" readonly>
+                                        </div>
+                                    </div>
+                                <?php endif; ?>
+
+                                <h2 data-section="individual"><?= __('Personal data') ?></h2>
+                                <h2 data-section="corporation"><?= __('Company data') ?></h2>
+
+                                <div class="admin__field _required" data-section="individual corporation">
+                                    <label for="document" class="admin__field-label">
+                                        <span><?= $block->getLabel('document_number') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" name="form[external_id]" id="external-id">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][document]" id="document"
+                                               placeholder="000.000.000-00"
+                                               data-document-number-for="seller"
+                                               data-document-mask data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required" data-section="individual">
+                                    <label for="recipient-name" class="admin__field-label">
+                                        <span><?= $block->getLabel('name') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][name]" id="recipient-name"
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required" data-section="corporation">
+                                    <label for="recipient-company-name" class="admin__field-label">
+                                        <span><?= __('Company name') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][company_name]"
+                                               id="recipient-company-name"
+                                               data-toggle-required>
                                     </div>
                                 </div>
 
-                                <div class="admin__field _required" id="recipient-name-div">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Name') ?></span>
+                                <div class="admin__field _required" data-section="corporation new-field">
+                                    <label for="recipient-trading-name" class="admin__field-label">
+                                        <span><?= __('Trading name') ?></span>
                                     </label>
                                     <div class="admin__field-control ">
-                                        <input type="text" class="recipient-form-inputs" name="form[name]" id="recipient-name" required>
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][trading_name]"
+                                               id="recipient-trading-name"
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required" data-section="individual corporation">
+                                    <label for="recipient-email" class="admin__field-label">
+                                        <span><?= $block->getLabel('email') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="email" class="recipient-form-inputs"
+                                               name="form[register_information][email]" id="recipient-email"
+                                               data-toggle-required>
                                     </div>
                                 </div>
 
-                                <div class="admin__field _required" id="email-recipient-div">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('E-mail') ?></span>
+                                <div class="admin__field" data-section="individual corporation new-field">
+                                    <label for="recipient-site" class="admin__field-label">
+                                        <span><?= __('Site URL') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" name="form[email]" id="email-recipient" required>
+                                        <input type="url" class="recipient-form-inputs"
+                                               name="form[register_information][site_url]" id="recipient-site">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field" data-section="individual new-field">
+                                    <label for="recipient-mother-name" class="admin__field-label">
+                                        <span><?= $block->getLabel('mother_name') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][mother_name]"
+                                               id="recipient-mother-name">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required" data-section="individual new-field">
+                                    <label for="recipient-birthdate" class="admin__field-label">
+                                        <span><?= $block->getLabel('birthdate') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][birthdate]" id="recipient-birthdate"
+                                               placeholder="dd/mm/yyyy" data-datepicker data-date-mask
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required" data-section="individual new-field">
+                                    <label for="recipient-monthly-income" class="admin__field-label">
+                                        <span><?= $block->getLabel('monthly_income') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][monthly_income]"
+                                               id="recipient-monthly-income" placeholder="00.000,00" data-currency-mask
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required" data-section="individual new-field">
+                                    <label for="recipient-professional-occupation" class="admin__field-label">
+                                        <span><?= $block->getLabel('profession') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][professional_occupation]"
+                                               id="recipient-professional-occupation" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required" data-section="corporation new-field">
+                                    <label for="recipient-annual-revenue" class="admin__field-label">
+                                        <span><?= __('Annual revenue') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][annual_revenue]"
+                                               id="recipient-annual-revenue" placeholder="0.000.000,00"
+                                               data-currency-mask data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field" data-section="corporation new-field">
+                                    <label for="recipient-corporation-type" class="admin__field-label">
+                                        <span><?= __('Company type') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][corporation_type]"
+                                               id="recipient-corporation-type">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field" data-section="corporation new-field">
+                                    <label for="recipient-founding-date" class="admin__field-label">
+                                        <span><?= __('Founding date') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][founding_date]"
+                                               id="recipient-founding-date"
+                                               placeholder="dd/mm/yyyy" data-datepicker data-date-mask>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="admin__fieldset" data-section="individual corporation new-field">
+
+                                <div class="admin__field">
+                                    <div class="admin__field-label">
+                                        <h3><?= __('Phone numbers') ?></h3>
                                     </div>
                                 </div>
-                                <div class="admin__field _required" id="document-type-div">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Document type') ?></span>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-phones-type-0" class="admin__field-label">
+                                        <span><?= $block->getLabel('contact_type') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[document_type]" id="document-type">
-                                            <option data-title="cpf" value="cpf"><?php echo __('CPF') ?></option>
-                                            <option data-title="cnpj" value="cnpj"><?php echo __('CNPJ') ?></option>
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[register_information][phone_number][0][type]"
+                                                id="recipient-phones-type-0" data-toggle-required>
+                                            <option
+                                                value="mobile_phone"><?= $block->getLabel('mobile_phone') ?></option>
+                                            <option value="home_phone"><?= __('Telephone') ?></option>
+                                        </select>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-phones-number-0" class="admin__field-label">
+                                        <span><?= $block->getLabel('contact_number') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="tel" class="recipient-form-inputs"
+                                               name="form[register_information][phone_number][0][number]"
+                                               id="recipient-phones-number-0" placeholder="(00) 00000-0000"
+                                               data-phone-mask data-toggle-required>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="admin__fieldset" data-section="individual new-field">
+
+                                <div class="admin__field">
+                                    <div class="admin__field-label">
+                                        <h3><?= __('Address') ?></h3>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-zip-code" class="admin__field-label">
+                                        <span><?= $block->getLabel('zip') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][address][zip_code]"
+                                               id="recipient-zip-code"
+                                               placeholder="00000-000" data-zipcode-mask data-cep-search
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-street" class="admin__field-label">
+                                        <span><?= $block->getLabel('street') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][address][street]" id="recipient-street"
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-street-number" class="admin__field-label">
+                                        <span><?= $block->getLabel('number') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][address][street_number]"
+                                               id="recipient-street-number" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field">
+                                    <label for="recipient-complementary" class="admin__field-label">
+                                        <span><?= $block->getLabel('complement') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][address][complementary]"
+                                               id="recipient-complementary">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field">
+                                    <label for="recipient-reference-point" class="admin__field-label">
+                                        <span><?= $block->getLabel('reference_point') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][address][reference_point]"
+                                               id="recipient-reference-point">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-neighborhood" class="admin__field-label">
+                                        <span><?= $block->getLabel('neighborhood') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][address][neighborhood]"
+                                               id="recipient-neighborhood" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-state" class="admin__field-label">
+                                        <span><?= $block->getLabel('state') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[register_information][address][state]" id="recipient-state"
+                                                data-state
+                                                data-toggle-required>
+                                            <option value=""><?= $block->getLabel('select') ?></option>
+                                            <?php foreach ($states as $state) {
+                                                echo "<option value='{$state['code']}'>
+                                                    {$state['default_name']}
+                                                </option>";
+                                            } ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-city" class="admin__field-label">
+                                        <span><?= $block->getLabel('city') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" list="recipient-cities" class="recipient-form-inputs"
+                                               name="form[register_information][address][city]" id="recipient-city"
+                                               data-toggle-required>
+                                        <datalist id="recipient-cities"></datalist>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="admin__fieldset" data-section="corporation new-field">
+
+                                <div class="admin__field">
+                                    <div class="admin__field-label">
+                                        <h3><?= __('Company address') ?></h3>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="company-zip-code" class="admin__field-label">
+                                        <span><?= $block->getLabel('zip') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][main_address][zip_code]"
+                                               id="company-zip-code" placeholder="00000-000" data-zipcode-mask
+                                               data-cep-search data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="company-street" class="admin__field-label">
+                                        <span><?= $block->getLabel('street') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][main_address][street]"
+                                               id="company-street"
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="company-street-number" class="admin__field-label">
+                                        <span><?= $block->getLabel('number') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][main_address][street_number]"
+                                               id="company-street-number" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field">
+                                    <label for="company-complementary" class="admin__field-label">
+                                        <span><?= $block->getLabel('complement') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][main_address][complementary]"
+                                               id="company-complementary">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field">
+                                    <label for="company-reference-point" class="admin__field-label">
+                                        <span><?= $block->getLabel('reference_point') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][main_address][reference_point]"
+                                               id="company-reference-point">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="company-neighborhood" class="admin__field-label">
+                                        <span><?= $block->getLabel('neighborhood') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][main_address][neighborhood]"
+                                               id="company-neighborhood" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="company-state" class="admin__field-label">
+                                        <span><?= $block->getLabel('state') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[register_information][main_address][state]"
+                                                id="company-state"
+                                                data-state
+                                                data-toggle-required>
+                                            <option value=""><?= $block->getLabel('select') ?></option>
+                                            <?php foreach ($states as $state) {
+                                                echo "<option value='{$state['code']}'>
+                                                    {$state['default_name']}
+                                                </option>";
+                                            } ?>
                                         </select>
                                     </div>
                                 </div>
 
-                                <div class="admin__field _required" id="document-div">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Document number') ?></span>
+                                <div class="admin__field _required">
+                                    <label for="company-city" class="admin__field-label">
+                                        <span><?= $block->getLabel('city') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" list="company-cities" class="recipient-form-inputs"
+                                               name="form[register_information][main_address][city]" id="company-city"
+                                               data-toggle-required>
+                                        <datalist id="company-cities"></datalist>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="admin__fieldset" data-section="corporation new-field">
+
+                                <div class="admin__field">
+                                    <div class="admin__field-label">
+                                        <h3><?= __('Managing partner') ?></h3>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-name" class="admin__field-label">
+                                        <span><?= $block->getLabel('name') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" list="recipient-partner-0-partners-list"
+                                               class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][name]"
+                                               id="recipient-partner-0-name" data-toggle-required>
+                                        <datalist id="recipient-partner-0-partners-list"></datalist>
+                                    </div>
+                                </div>
+
+                                <input type="hidden" name="form[register_information][managing_partners][0][type]"
+                                       id="recipient-partner-document-type-0"
+                                       value="individual" tabindex="-1" data-toggle-required/>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-document" class="admin__field-label">
+                                        <span><?= $block->getLabel('document_number') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][document]"
+                                               id="recipient-partner-0-document" placeholder="000.000.000-00"
+                                               data-document-mask data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field">
+                                    <label for="recipient-partner-0-mother-name" class="admin__field-label">
+                                        <span><?= $block->getLabel('mother_name') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][mother_name]"
+                                               id="recipient-partner-0-mother-name">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-email" class="admin__field-label">
+                                        <span><?= $block->getLabel('email') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" pattern="[0-9]+" maxlength="18" name="form[document]" id="document" required>
+                                        <input type="email" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][email]"
+                                               id="recipient-partner-0-email" data-toggle-required>
                                     </div>
                                 </div>
 
-                                <input id="type" name="form[type]" value="individual" type="hidden" />
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-birthdate" class="admin__field-label">
+                                        <span><?= $block->getLabel('birthdate') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][birthdate]"
+                                               id="recipient-partner-0-birthdate" placeholder="dd/mm/yyyy"
+                                               data-datepicker data-date-mask data-toggle-required>
+                                    </div>
+                                </div>
 
-                                <h2><?php echo __('Banking information') ?></h2>
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-monthly-income" class="admin__field-label">
+                                        <span><?= $block->getLabel('monthly_income') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][monthly_income]"
+                                               id="recipient-partner-0-monthly-income" placeholder="0.000,00"
+                                               data-currency-mask data-toggle-required>
+                                    </div>
+                                </div>
 
                                 <div class="admin__field _required">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Holder name') ?></span>
+                                    <label for="recipient-partner-0-professional-occupation"
+                                           class="admin__field-label">
+                                        <span><?= $block->getLabel('profession') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" name="form[holder_name]" id="holder-name" required>
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][professional_occupation]"
+                                               id="recipient-partner-0-professional-occupation" data-toggle-required>
                                     </div>
                                 </div>
 
+                                <input type="hidden"
+                                       name="form[register_information][managing_partners][0][self_declared_legal_representative]"
+                                       id="recipient-partner-0-declaration"
+                                       value="1" tabindex="-1" data-toggle-required/>
+
+                            </div>
+                            <div class="admin__fieldset" data-section="corporation new-field">
+
                                 <div class="admin__field">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Document type') ?></span>
+                                    <div class="admin__field-label">
+                                        <h3><?= __('Managing partner phone numbers') ?></h3>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-phones-type-0" class="admin__field-label">
+                                        <span><?= $block->getLabel('contact_type') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[holder_document_type]" id="holder-document-type">
-                                            <option data-title="cpf" value="cpf"><?php echo __('CPF') ?></option>
-                                            <option data-title="cnpj" value="cnpj"><?php echo __('CNPJ') ?></option>
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[register_information][managing_partners][0][phone_number][0][type]"
+                                                id="recipient-partner-0-phones-type-0" data-toggle-required>
+                                            <option
+                                                value="mobile_phone"><?= $block->getLabel('mobile_phone') ?></option>
+                                            <option value="home_phone"><?= __('Telephone') ?></option>
                                         </select>
                                     </div>
                                 </div>
 
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-phones-number-0" class="admin__field-label">
+                                        <span><?= $block->getLabel('contact_number') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="tel" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][phone_number][0][number]"
+                                               id="recipient-partner-0-phones-number-0" placeholder="(00) 00000-0000"
+                                               data-phone-mask data-toggle-required>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="admin__fieldset" data-section="corporation new-field">
+
+                                <div class="admin__field">
+                                    <div class="admin__field-label">
+                                        <h3><?= __('Managing partner address') ?></h3>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-zip-code" class="admin__field-label">
+                                        <span><?= $block->getLabel('zip') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][address][zip_code]"
+                                               id="recipient-partner-0-zip-code" placeholder="00000-000"
+                                               data-zipcode-mask data-cep-search data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-street" class="admin__field-label">
+                                        <span><?= $block->getLabel('street') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][address][street]"
+                                               id="recipient-partner-0-street" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-street-number" class="admin__field-label">
+                                        <span><?= $block->getLabel('number') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][address][street_number]"
+                                               id="recipient-partner-0-street-number" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field">
+                                    <label for="recipient-partner-0-complementary" class="admin__field-label">
+                                        <span><?= $block->getLabel('complement') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][address][complementary]"
+                                               id="recipient-partner-0-complementary">
+                                    </div>
+                                </div>
+
                                 <div class="admin__field">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Document number') ?></span>
+                                    <label for="recipient-partner-0-reference-point" class="admin__field-label">
+                                        <span><?= $block->getLabel('reference_point') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][address][reference_point]"
+                                               id="recipient-partner-0-reference-point">
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-neighborhood" class="admin__field-label">
+                                        <span><?= $block->getLabel('neighborhood') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][address][neighborhood]"
+                                               id="recipient-partner-0-neighborhood" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-state" class="admin__field-label">
+                                        <span><?= $block->getLabel('state') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[register_information][managing_partners][0][address][state]"
+                                                id="recipient-partner-0-state"
+                                                data-state
+                                                data-toggle-required>
+                                            <option value=""><?= $block->getLabel('select') ?></option>
+                                            <?php foreach ($states as $state) {
+                                                echo "<option value='{$state['code']}'>
+                                                    {$state['default_name']}
+                                                </option>";
+                                            } ?>
+                                        </select>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="recipient-partner-0-city" class="admin__field-label">
+                                        <span><?= $block->getLabel('city') ?></span>
+                                    </label>
+                                    <div class="admin__field-control ">
+                                        <input type="text" list="recipient-partner-0-cities"
+                                               class="recipient-form-inputs"
+                                               name="form[register_information][managing_partners][0][address][city]"
+                                               id="recipient-partner-0-city"
+                                               data-toggle-required>
+                                        <datalist id="recipient-partner-0-cities"></datalist>
+                                    </div>
+                                </div>
+
+                            </div>
+                            <div class="admin__fieldset" data-section="individual corporation">
+
+                                <h2><?= __('Banking information') ?></h2>
+
+                                <p class="recipient-block-info">
+                                    <?= __('The bank account holder must be the recipient (same document number).') ?>
+                                </p>
+
+                                <div class="admin__field _required">
+                                    <label for="holder-name" class="admin__field-label">
+                                        <span><?= __('Holder name') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" name="form[holder_document]" id="holder-document">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[holder_name]" id="holder-name"
+                                               readonly data-toggle-required>
                                     </div>
                                 </div>
 
                                 <div class="admin__field _required">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Bank code') ?></span>
+                                    <label for="holder-document-type" class="admin__field-label">
+                                        <span><?= $block->getLabel('document_type') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" maxlength="3" name="form[bank]" id="bank" required>
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[holder_document_type]"
+                                                id="holder-document-type" readonly data-toggle-required>
+                                            <option value=""><?= $block->getLabel('select') ?></option>
+                                            <option value="individual"><?= __('CPF') ?></option>
+                                            <option value="company"><?= __('CNPJ') ?></option>
+                                        </select>
                                     </div>
                                 </div>
 
                                 <div class="admin__field _required">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Branch number') ?></span>
+                                    <label for="holder-document" class="admin__field-label">
+                                        <span><?= $block->getLabel('document_number') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" maxlength="5" pattern="[0-9]{0,5}" name="form[branch_number]" id="branch-number" required>
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[holder_document]" id="holder-document"
+                                               placeholder="000.000.000-00" readonly data-document-mask
+                                               data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="bank" class="admin__field-label">
+                                        <span><?= __('Bank code') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="text" class="recipient-form-inputs" maxlength="3"
+                                               name="form[bank]" id="bank" data-toggle-required>
+                                    </div>
+                                </div>
+
+                                <div class="admin__field _required">
+                                    <label for="branch-number" class="admin__field-label">
+                                        <span><?= __('Branch number') ?></span>
+                                    </label>
+                                    <div class="admin__field-control">
+                                        <input type="text" class="recipient-form-inputs" maxlength="5"
+                                               pattern="[0-9]{0,5}" name="form[branch_number]"
+                                               id="branch-number" data-toggle-required>
                                     </div>
                                 </div>
 
                                 <div class="admin__field">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Branch check digit') ?></span>
+                                    <label for="branch-check-digit" class="admin__field-label">
+                                        <span><?= __('Branch check digit') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" name="form[branch_check_digit]" id="branch-check-digit">
+                                        <input type="text" class="recipient-form-inputs"
+                                               name="form[branch_check_digit]" id="branch-check-digit">
                                     </div>
                                 </div>
 
                                 <div class="admin__field _required">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Account number') ?></span>
+                                    <label for="account-number" class="admin__field-label">
+                                        <span><?= __('Account number') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" maxlength="13" pattern="[0-9]{0,13}" name="form[account_number]" id="account-number" required>
+                                        <input type="text" class="recipient-form-inputs" maxlength="13"
+                                               pattern="[0-9]{0,13}" name="form[account_number]"
+                                               id="account-number" data-toggle-required>
                                     </div>
                                 </div>
 
                                 <div class="admin__field _required">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Account check digit') ?></span>
+                                    <label for="account-check-digit" class="admin__field-label">
+                                        <span><?= __('Account check digit') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <input type="text" class="recipient-form-inputs" maxlength="2" name="form[account_check_digit]" id="account-check-digit" required>
+                                        <input type="text" class="recipient-form-inputs" maxlength="2"
+                                               name="form[account_check_digit]"
+                                               id="account-check-digit" data-toggle-required>
                                     </div>
                                 </div>
 
                                 <div class="admin__field _required">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Account type') ?></span>
+                                    <label for="account-type" class="admin__field-label">
+                                        <span><?= __('Account type') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[account_type]" id="account-type">
-                                            <option value="checking"><?php echo __('Checking') ?></option>
-                                            <option value="savings"><?php echo __('Savings') ?></option>
-                                            <option value="conjunct_checking"><?php echo __('Conjunct checking') ?></option>
-                                            <option value="conjunct_savings"><?php echo __('Conjunct savings') ?></option>
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[account_type]" id="account-type">
+                                            <option value="checking"><?= __('Checking') ?></option>
+                                            <option value="savings"><?= __('Savings') ?></option>
+                                            <option value="conjunct_checking">
+                                                <?= __('Conjunct checking') ?></option>
+                                            <option value="conjunct_savings">
+                                                <?= __('Conjunct savings') ?></option>
                                         </select>
                                     </div>
                                 </div>
 
-                                <h2><?php echo __('Transfer settings') ?></h2>
+                                <h2><?= __('Transfer settings') ?></h2>
 
-                                <div class="admin__field _required">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Enable automatic transfer') ?></span>
+                                <div class="admin__field">
+                                    <label for="transfer-enabled" class="admin__field-label">
+                                        <span><?= __('Enable automatic transfer') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[transfer_enabled]" id="transfer-enabled">
-                                            <option value="0"><?php echo __('No') ?></option>
-                                            <option value="1"><?php echo __('Yes') ?></option>
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[transfer_enabled]" id="transfer-enabled">
+                                            <option value="0"><?= $block->getLabel('no') ?></option>
+                                            <option value="1"><?= $block->getLabel('yes') ?></option>
                                         </select>
                                     </div>
                                 </div>
 
-                                <div class="admin__field _required" id="transfer-interval-div">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Transfer interval') ?></span>
+                                <div class="admin__field _required" data-section="transfer_interval"
+                                     id="transfer-interval-div">
+                                    <label for="transfer-interval" class="admin__field-label">
+                                        <span><?= __('Transfer interval') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[transfer_interval]" id="transfer-interval">
-                                            <option value="Daily"><?php echo __('Daily') ?></option>
-                                            <option value="Weekly"><?php echo __('Weekly') ?></option>
-                                            <option value="Monthly"><?php echo __('Monthly') ?></option>
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[transfer_interval]" id="transfer-interval"
+                                                data-toggle-required>
+                                            <option value="Daily"><?= __('Daily') ?></option>
+                                            <option value="Weekly"><?= __('Weekly') ?></option>
+                                            <option value="Monthly"><?= __('Monthly') ?></option>
                                         </select>
                                     </div>
                                 </div>
 
-                                <div class="admin__field _required" id="transfer-day-div">
-                                    <label class="admin__field-label">
-                                        <span><?php echo __('Transfer day') ?></span>
+                                <div class="admin__field _required" data-section="transfer_day" id="transfer-day-div">
+                                    <label for="transfer-day" class="admin__field-label">
+                                        <span><?= __('Transfer day') ?></span>
                                     </label>
                                     <div class="admin__field-control">
-                                        <select class="recipient-form-inputs admin__control-select" name="form[transfer_day]" id="transfer-day">
+                                        <select class="recipient-form-inputs admin__control-select"
+                                                name="form[transfer_day]" id="transfer-day" data-toggle-required>
                                             <option value="0">0</option>
                                         </select>
                                     </div>
@@ -281,4 +981,4 @@
     </div>
 </form>
 <!-- Edit Recipient-->
-<input id="edit-recipient" name='form[edit_recipient_id]' value='<?php echo $block->getEditRecipient(); ?>' type="hidden" />
+<input type="hidden" name="form[edit_recipient_id]" id="edit-recipient" value='<?= $editRecipient ?>' tabindex="-1"/>
diff --git a/view/adminhtml/templates/recurrence/plans/create.phtml b/view/adminhtml/templates/recurrence/plans/create.phtml
index 9cc93973..8950a406 100644
--- a/view/adminhtml/templates/recurrence/plans/create.phtml
+++ b/view/adminhtml/templates/recurrence/plans/create.phtml
@@ -61,7 +61,7 @@
             <div id="container" class="main-col">
                 <div class="entry-edit form-inline">
                     <div class="fieldset-wrapper">
-                        <div class="admin__fieldset-wrapper-content _hide">
+                        <div class="admin__fieldset-wrapper-content">
                             <fieldset class="admin__fieldset">
                                 <legend></legend>
 
diff --git a/view/adminhtml/templates/recurrence/subscriptions/create.phtml b/view/adminhtml/templates/recurrence/subscriptions/create.phtml
index a94db0be..8732ee20 100644
--- a/view/adminhtml/templates/recurrence/subscriptions/create.phtml
+++ b/view/adminhtml/templates/recurrence/subscriptions/create.phtml
@@ -59,7 +59,7 @@ $quantityOptionCicle = 4;
             <div id="container" class="main-col">
                 <div class="entry-edit form-inline">
                     <div class="fieldset-wrapper">
-                        <div class="admin__fieldset-wrapper-content _hide">
+                        <div class="admin__fieldset-wrapper-content">
                             <fieldset class="admin__fieldset">
                                 <legend></legend>
                                 <div class="fieldset-wrapper admin__collapsible-block-wrapper products-wrapper"
diff --git a/view/adminhtml/ui_component/pagarme_pagarme_recipients_listing.xml b/view/adminhtml/ui_component/pagarme_pagarme_recipients_listing.xml
index 3c44a272..6bcd4d27 100644
--- a/view/adminhtml/ui_component/pagarme_pagarme_recipients_listing.xml
+++ b/view/adminhtml/ui_component/pagarme_pagarme_recipients_listing.xml
@@ -123,7 +123,21 @@
                 </item>
             </argument>
         </column>
-        <actionsColumn name="actions" class="Pagarme\Pagarme\Ui\Component\Column\Actions">
+        <column name="status" component="Pagarme_Pagarme/js/grid/columns/recipientStatus">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="filter" xsi:type="string">text</item>
+                    <item name="editor" xsi:type="array">
+                        <item name="editorType" xsi:type="string">text</item>
+                        <item name="validation" xsi:type="array">
+                            <item name="required-entry" xsi:type="boolean">true</item>
+                        </item>
+                    </item>
+                    <item name="label" xsi:type="string" translate="true">Status</item>
+                </item>
+            </argument>
+        </column>
+        <actionsColumn name="actions" class="Pagarme\Pagarme\Ui\Component\Column\RecipientActions">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="indexField" xsi:type="string">id</item>
diff --git a/view/adminhtml/web/css/jquery-ui.min.css b/view/adminhtml/web/css/jquery-ui.min.css
deleted file mode 100644
index 121f222f..00000000
--- a/view/adminhtml/web/css/jquery-ui.min.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*! jQuery UI - v1.12.1 - 2016-09-14
-* http://jqueryui.com
-* Includes: core.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, draggable.css, resizable.css, progressbar.css, selectable.css, selectmenu.css, slider.css, sortable.css, spinner.css, tabs.css, tooltip.css, theme.css
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&fwDefault=normal&cornerRadius=3px&bgColorHeader=e9e9e9&bgTextureHeader=flat&borderColorHeader=dddddd&fcHeader=333333&iconColorHeader=444444&bgColorContent=ffffff&bgTextureContent=flat&borderColorContent=dddddd&fcContent=333333&iconColorContent=444444&bgColorDefault=f6f6f6&bgTextureDefault=flat&borderColorDefault=c5c5c5&fcDefault=454545&iconColorDefault=777777&bgColorHover=ededed&bgTextureHover=flat&borderColorHover=cccccc&fcHover=2b2b2b&iconColorHover=555555&bgColorActive=007fff&bgTextureActive=flat&borderColorActive=003eff&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fffa90&bgTextureHighlight=flat&borderColorHighlight=dad55e&fcHighlight=777620&iconColorHighlight=777620&bgColorError=fddfdf&bgTextureError=flat&borderColorError=f1a899&fcError=5f3f3f&iconColorError=cc0000&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=666666&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=0px&offsetLeftShadow=0px&cornerRadiusShadow=8px
-* Copyright jQuery Foundation and other contributors; Licensed MIT */
-
-.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer;list-style-image:url("data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7")}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:visible}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-button-icon-only{text-indent:0}.ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-controlgroup{vertical-align:middle;display:inline-block}.ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.ui-controlgroup > .ui-controlgroup-item:focus,.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.ui-controlgroup .ui-controlgroup-label span{font-size:80%}.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.ui-controlgroup-vertical .ui-spinner-input{width:75%;width:calc( 100% - 2.4em )}.ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.ui-checkboxradio-disabled{pointer-events:none}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-n{height:2px;top:0}.ui-dialog .ui-resizable-e{width:2px;right:0}.ui-dialog .ui-resizable-s{height:2px;bottom:0}.ui-dialog .ui-resizable-w{width:2px;left:0}.ui-dialog .ui-resizable-se,.ui-dialog .ui-resizable-sw,.ui-dialog .ui-resizable-ne,.ui-dialog .ui-resizable-nw{width:7px;height:7px}.ui-dialog .ui-resizable-se{right:0;bottom:0}.ui-dialog .ui-resizable-sw{left:0;bottom:0}.ui-dialog .ui-resizable-ne{right:0;top:0}.ui-dialog .ui-resizable-nw{left:0;top:0}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-draggable-handle{-ms-touch-action:none;touch-action:none}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;-ms-touch-action:none;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;filter:alpha(opacity=25);opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectable{-ms-touch-action:none;touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:default;-ms-touch-action:none;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider.ui-state-disabled .ui-slider-handle,.ui-slider.ui-state-disabled .ui-slider-range{filter:inherit}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-sortable-handle{-ms-touch-action:none;touch-action:none}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #c5c5c5}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#2b2b2b;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-icon-background,.ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-checked{border:1px solid #dad55e;background:#fffa90}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;filter:Alpha(Opacity=70);font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;filter:Alpha(Opacity=35);background-image:none}.ui-state-disabled .ui-icon{filter:Alpha(Opacity=35)}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-icon-blank{background-position:16px 16px}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.3;filter:Alpha(Opacity=30)}.ui-widget-shadow{-webkit-box-shadow:0 0 5px #666;box-shadow:0 0 5px #666}
\ No newline at end of file
diff --git a/view/adminhtml/web/css/pagarme_style.css b/view/adminhtml/web/css/pagarme_style.css
index cf0cb801..d4af62af 100644
--- a/view/adminhtml/web/css/pagarme_style.css
+++ b/view/adminhtml/web/css/pagarme_style.css
@@ -7,8 +7,8 @@
     margin-bottom: 10px;
 }
 
-.product_search {
-    border-color: #878787;
+.product_search,
+#pagarme-recipients-form .recipient-form-inputs {
     -webkit-appearance: none;
     background-color: #fff;
     border: 1px solid #adadad;
@@ -19,13 +19,20 @@
     font-weight: 400;
     height: auto;
     line-height: 1.36;
-    padding: .6rem 1rem .6rem;
     transition: border-color .1s linear;
     vertical-align: baseline;
-    width: 15%;
     margin-left: 10px;
 }
 
+.product_search {
+    padding: .6rem 1rem .6rem;
+    width: 15%;
+}
+
+#pagarme-recipients-form .recipient-form-inputs {
+    width: 50%;
+}
+
 .table-products {
     display: none;
 }
@@ -49,6 +56,7 @@
 .ui-autocomplete.ui-menu .ui-menu-item a.ui-corner-all{
     text-decoration: none;
 }
+
 .ui-autocomplete.ui-menu .ui-menu-item a.ui-state-focus{
     background-color: transparent!important;
     border: none;
@@ -67,34 +75,156 @@ table.table-cycles {
     padding: 8px;
 }
 
-#error-message{
+.error-message {
     margin: 10px 0;
     color: red;
     font-size: 10px;
     display: none;
 }
 
-.recipient-form-inputs {
-    border-color: #878787;
-    -webkit-appearance: none;
-    background-color: #fff;
-    border: 1px solid #adadad;
-    border-radius: 1px;
-    box-shadow: none;
-    color: #303030;
-    font-size: 1.4rem;
-    font-weight: 400;
-    height: auto;
-    line-height: 1.36;
+#pagarme-recipients-form [data-section] {
+    display: none;
+}
+
+#pagarme-recipients-form .recipient-form-inputs:focus {
+    border-color: #8fb5cf;
+    box-shadow: 0 0 .5em rgba(10, 10, 10, 0.25);
+}
+
+#pagarme-recipients-form .recipient-form-inputs:not(.admin__control-select) {
     padding: .6rem 1rem .6rem;
-    transition: border-color .1s linear;
-    vertical-align: baseline;
-    width: 50%;
-    margin-left: 10px;
 }
 
-.readonly {
+#pagarme-recipients-form h3 {
+    display: inline;
+}
+
+#pagarme-recipients-form .recipient-block-info {
+    margin: 0 0 2em;
+    font-style: italic;
+}
+
+#pagarme-recipients-form .readonly,
+#pagarme-recipients-form [readonly] {
     background: #eee;
     pointer-events: none;
     touch-action: none;
-}
\ No newline at end of file
+}
+
+#pagarme-recipients-form .message.message-error.error {
+    display: none;
+}
+
+.pagarme-recipient-modal header .modal-title{
+    padding-bottom: 2.5rem;
+    text-align: center;
+    margin-right: 0px;
+}
+
+.pagarme-recipient-modal .modal-inner-wrap {
+     max-width: 520px;
+ }
+
+.pagarme-recipient-modal p {
+    margin-bottom: 1.5em;
+}
+
+.pagarme-recipient-modal *:last-child {
+    margin-bottom: .5em;
+}
+
+.pagarme-alert-text {
+    font-weight: bold;
+    color: #cd0909;
+}
+
+.data-grid td .action-menu-item.kyc-validation:link,
+.data-grid td .action-menu-item.kyc-validation:visited,
+.data-grid td .action-menu-item.kyc-validation:hover,
+.data-grid td .action-menu-item.kyc-validation:active {
+    text-decoration: none;
+    cursor: pointer;
+}
+
+.data-grid td .kyc-validation-status {
+    background: #000 none repeat scroll 0 0;
+    border: 1px solid #000;
+    display: block;
+    font-weight: bold;
+    line-height: 17px;
+    padding: 0 3px;
+    text-align: center;
+}
+
+.data-grid td .kyc-validation-status.recipient-status-waiting_for_analysis {
+    background-color: #fff7d6;
+    border-color: #974f0c;
+    color: #974f0c;
+}
+
+.data-grid td .recipient-status-active {
+    background-color: #d0e5a9;
+    border-color: #5b8116;
+    color: #185b00;
+}
+
+.data-grid td .recipient-status-registered {
+    background-color: #f1f2f4;
+    border-color: #42526e;
+    color: #42526e;
+}
+
+.data-grid td .recipient-status-disapproved,
+.data-grid td .recipient-status-suspended,
+.data-grid td .recipient-status-blocked,
+.data-grid td .recipient-status-inactive,
+.data-grid td .recipient-status-refused  {
+    background-color: #f9d4d4;
+    border-color: #e22626;
+    color: #e22626;
+}
+
+.pagarme-recipient-modal .kyc-link-container {
+    display: flex;
+    flex-wrap: wrap;
+    align-content: center;
+    margin-bottom: 2rem;
+}
+.pagarme-recipient-modal #kyc-link {
+    width: calc(100% - 10rem);
+    height: 5rem;
+    padding: 1rem 1rem;
+    border: 1px solid #adadad;
+    border-right: 0;
+    border-radius: 6px 0 0 6px;
+}
+
+.pagarme-recipient-modal #kyc-copy-button {
+    width: 10rem;
+    height: 5rem;
+    border-radius: 0 6px 6px 0;
+}
+
+.pagarme-recipient-modal #kyc-copy-message {
+    display: none;
+    margin: .25rem 0 0 .25rem;
+}
+
+.pagarme-recipient-modal #kyc-copy-message.success {
+    color: #35a335;
+}
+
+.pagarme-recipient-modal #kyc-copy-message.error {
+    color: #cd0909;
+}
+
+/*
+ * Jquery UI Fix
+ */
+.ui-datepicker .ui-datepicker-title select:first-child {
+    margin-right: 6%;
+}
+
+.ui-datepicker .ui-datepicker-title select:last-child {
+    margin-right: 0;
+}
diff --git a/view/adminhtml/web/js/grid/columns/recipientStatus.js b/view/adminhtml/web/js/grid/columns/recipientStatus.js
new file mode 100644
index 00000000..18d7a2d7
--- /dev/null
+++ b/view/adminhtml/web/js/grid/columns/recipientStatus.js
@@ -0,0 +1,154 @@
+define([
+    'underscore',
+    'Magento_Ui/js/grid/columns/column',
+    "mage/url",
+    'Magento_Ui/js/modal/alert',
+    'jquery',
+    'loader'
+], function (_, Column, mageUrl, alert, $) {
+    'use strict';
+
+    // TODO: Using portuguese strings because mage/translate and knockout i18n were not working
+
+    return Column.extend({
+        defaults: {
+            bodyTmpl: 'Pagarme_Pagarme/ui/grid/cells/recipientStatus'
+        },
+        getStatusClass: function (row) {
+            const defaultClasses = 'data-grid-cell-content';
+            const status = row.status;
+            if (typeof status === 'string') {
+                return `${defaultClasses} kyc-validation-status recipient-status-${status}`;
+            }
+            return defaultClasses;
+        },
+        getLabel: function (row) {
+            let status = row.status;
+
+            if (typeof status === 'string') {
+                status = this.getStatusLabel(status);
+            }
+
+            return status;
+        },
+        getStatusLabel: function (status) {
+            let statusLabel = ''
+            switch (status) {
+                case 'registered':
+                    statusLabel = 'Cadastrado';
+                    break;
+                case 'validation_requested':
+                    statusLabel = 'Validação Solicitada'
+                    break;
+                case 'waiting_for_analysis':
+                    statusLabel = 'Aguardando Análise'
+                    break;
+                case 'active':
+                    statusLabel = 'Aprovado'
+                    break;
+                case 'disapproved':
+                    statusLabel = 'Reprovado'
+                    break;
+                case 'suspended':
+                    statusLabel = 'Suspenso'
+                    break;
+                case 'blocked':
+                    statusLabel = 'Bloqueado'
+                    break;
+                case 'refused':
+                    statusLabel = 'Recusado'
+                    break;
+                case 'inactive':
+                    statusLabel = 'Inativo'
+                    break;
+            }
+
+            return statusLabel;
+        },
+        needsValidation: function (row) {
+            return row.status === 'validation_requested';
+        },
+        generateKycLink: async function (row) {
+            const body = $('body');
+            try {
+                body.loader('show');
+                const url = mageUrl.build(`/rest/V1/pagarme/marketplace/recipient/kyc/link/${row.id}`);
+                const response = await $.get(mageUrl.build(url));
+                body.loader('hide');
+                if (response) {
+                    this.mageAlert(this.getModalContent(response.url));
+                    $('#kyc-copy-button').on('click', async function (){
+                        const linkInput = $('#kyc-link'),
+                            messageElement = $('#kyc-copy-message');
+
+                        const url = linkInput.attr("value"),
+                            showSuccessMessage = () => {
+                                messageElement.html('Link copiado para a área de transferência.')
+                                    .addClass('success')
+                                    .fadeIn('200');
+
+                                setTimeout(function (){
+                                    messageElement.fadeOut('400');
+                                }, 3000);
+                            },
+                            showFailMessage = () => {
+                                linkInput.prop('disabled', false)
+                                    .prop('readonly', true)
+                                    .focus()
+                                    .select();
+
+                                messageElement.html(
+                                        'Falha ao copiar! Por favor, copie o link manualmente utilizando o campo acima.'
+                                    ).addClass('error')
+                                    .fadeIn('200');
+
+                                setTimeout(function (){
+                                    messageElement.fadeOut('400');
+                                }, 4000);
+                            };
+
+                        if (window.isSecureContext && navigator.clipboard) {
+                            try {
+                                await navigator.clipboard.writeText(url);
+                                showSuccessMessage();
+                            } catch (err) {
+                                showFailMessage();
+                            }
+                            return;
+                        }
+
+                        const [linkDOMElement] = linkInput;
+                        linkDOMElement.select();
+                        linkDOMElement.setSelectionRange(0, linkInput.val().length);
+                        try {
+                            document.execCommand('copy', false);
+                            showSuccessMessage();
+                        } catch (err) {
+                            showFailMessage();
+                        }
+                    })
+                }
+            } catch (exception) {
+                body.loader('hide');
+                body.notification('clear');
+                this.mageAlert(`<p>Algo deu errado, por favor tente novamente mais tarde.</p>`);
+            }
+
+        },
+        getModalContent: function (url) {
+            return `<p>Envie o link abaixo para que o recebedor complete a nossa validação de segurança.</p>`
+                + `<p><span class='pagarme-alert-text'>Atenção!</span> O link é válido por 20 minutos.</p>`
+                + `<div class="kyc-link-container"><input type="text" id="kyc-link" value="${url}" disabled/>`
+                + `<button id="kyc-copy-button">Copiar</button><span id="kyc-copy-message"></span></div>`;
+        },
+        mageAlert(content) {
+            const alertObject = {
+                title: 'Ative a movimentação do saldo deste recebedor',
+                content: content,
+                modalClass: 'pagarme-recipient-modal',
+                buttons: []
+            };
+            alert(alertObject);
+        }
+    });
+});
diff --git a/view/adminhtml/web/js/jquery.mask.min.js b/view/adminhtml/web/js/jquery.mask.min.js
new file mode 100644
index 00000000..1f22376e
--- /dev/null
+++ b/view/adminhtml/web/js/jquery.mask.min.js
@@ -0,0 +1,19 @@
+// jQuery Mask Plugin v1.14.16
+// github.com/igorescobar/jQuery-Mask-Plugin
+var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(a,n,f){a instanceof String&&(a=String(a));for(var p=a.length,k=0;k<p;k++){var b=a[k];if(n.call(f,b,k,a))return{i:k,v:b}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.SIMPLE_FROUND_POLYFILL=!1;
+$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(a,n,f){a!=Array.prototype&&a!=Object.prototype&&(a[n]=f.value)};$jscomp.getGlobal=function(a){return"undefined"!=typeof window&&window===a?a:"undefined"!=typeof global&&null!=global?global:a};$jscomp.global=$jscomp.getGlobal(this);
+$jscomp.polyfill=function(a,n,f,p){if(n){f=$jscomp.global;a=a.split(".");for(p=0;p<a.length-1;p++){var k=a[p];k in f||(f[k]={});f=f[k]}a=a[a.length-1];p=f[a];n=n(p);n!=p&&null!=n&&$jscomp.defineProperty(f,a,{configurable:!0,writable:!0,value:n})}};$jscomp.polyfill("Array.prototype.find",function(a){return a?a:function(a,f){return $jscomp.findInternal(this,a,f).v}},"es6","es3");
+(function(a,n,f){"function"===typeof define&&define.amd?define(["jquery"],a):"object"===typeof exports&&"undefined"===typeof Meteor?module.exports=a(require("jquery")):a(n||f)})(function(a){var n=function(b,d,e){var c={invalid:[],getCaret:function(){try{var a=0,r=b.get(0),h=document.selection,d=r.selectionStart;if(h&&-1===navigator.appVersion.indexOf("MSIE 10")){var e=h.createRange();e.moveStart("character",-c.val().length);a=e.text.length}else if(d||"0"===d)a=d;return a}catch(C){}},setCaret:function(a){try{if(b.is(":focus")){var c=
+b.get(0);if(c.setSelectionRange)c.setSelectionRange(a,a);else{var g=c.createTextRange();g.collapse(!0);g.moveEnd("character",a);g.moveStart("character",a);g.select()}}}catch(B){}},events:function(){b.on("keydown.mask",function(a){b.data("mask-keycode",a.keyCode||a.which);b.data("mask-previus-value",b.val());b.data("mask-previus-caret-pos",c.getCaret());c.maskDigitPosMapOld=c.maskDigitPosMap}).on(a.jMaskGlobals.useInput?"input.mask":"keyup.mask",c.behaviour).on("paste.mask drop.mask",function(){setTimeout(function(){b.keydown().keyup()},
+100)}).on("change.mask",function(){b.data("changed",!0)}).on("blur.mask",function(){f===c.val()||b.data("changed")||b.trigger("change");b.data("changed",!1)}).on("blur.mask",function(){f=c.val()}).on("focus.mask",function(b){!0===e.selectOnFocus&&a(b.target).select()}).on("focusout.mask",function(){e.clearIfNotMatch&&!k.test(c.val())&&c.val("")})},getRegexMask:function(){for(var a=[],b,c,e,t,f=0;f<d.length;f++)(b=l.translation[d.charAt(f)])?(c=b.pattern.toString().replace(/.{1}$|^.{1}/g,""),e=b.optional,
+(b=b.recursive)?(a.push(d.charAt(f)),t={digit:d.charAt(f),pattern:c}):a.push(e||b?c+"?":c)):a.push(d.charAt(f).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&"));a=a.join("");t&&(a=a.replace(new RegExp("("+t.digit+"(.*"+t.digit+")?)"),"($1)?").replace(new RegExp(t.digit,"g"),t.pattern));return new RegExp(a)},destroyEvents:function(){b.off("input keydown keyup paste drop blur focusout ".split(" ").join(".mask "))},val:function(a){var c=b.is("input")?"val":"text";if(0<arguments.length){if(b[c]()!==a)b[c](a);
+c=b}else c=b[c]();return c},calculateCaretPosition:function(a){var d=c.getMasked(),h=c.getCaret();if(a!==d){var e=b.data("mask-previus-caret-pos")||0;d=d.length;var g=a.length,f=a=0,l=0,k=0,m;for(m=h;m<d&&c.maskDigitPosMap[m];m++)f++;for(m=h-1;0<=m&&c.maskDigitPosMap[m];m--)a++;for(m=h-1;0<=m;m--)c.maskDigitPosMap[m]&&l++;for(m=e-1;0<=m;m--)c.maskDigitPosMapOld[m]&&k++;h>g?h=10*d:e>=h&&e!==g?c.maskDigitPosMapOld[h]||(e=h,h=h-(k-l)-a,c.maskDigitPosMap[h]&&(h=e)):h>e&&(h=h+(l-k)+f)}return h},behaviour:function(d){d=
+d||window.event;c.invalid=[];var e=b.data("mask-keycode");if(-1===a.inArray(e,l.byPassKeys)){e=c.getMasked();var h=c.getCaret(),g=b.data("mask-previus-value")||"";setTimeout(function(){c.setCaret(c.calculateCaretPosition(g))},a.jMaskGlobals.keyStrokeCompensation);c.val(e);c.setCaret(h);return c.callbacks(d)}},getMasked:function(a,b){var h=[],f=void 0===b?c.val():b+"",g=0,k=d.length,n=0,p=f.length,m=1,r="push",u=-1,w=0;b=[];if(e.reverse){r="unshift";m=-1;var x=0;g=k-1;n=p-1;var A=function(){return-1<
+g&&-1<n}}else x=k-1,A=function(){return g<k&&n<p};for(var z;A();){var y=d.charAt(g),v=f.charAt(n),q=l.translation[y];if(q)v.match(q.pattern)?(h[r](v),q.recursive&&(-1===u?u=g:g===x&&g!==u&&(g=u-m),x===u&&(g-=m)),g+=m):v===z?(w--,z=void 0):q.optional?(g+=m,n-=m):q.fallback?(h[r](q.fallback),g+=m,n-=m):c.invalid.push({p:n,v:v,e:q.pattern}),n+=m;else{if(!a)h[r](y);v===y?(b.push(n),n+=m):(z=y,b.push(n+w),w++);g+=m}}a=d.charAt(x);k!==p+1||l.translation[a]||h.push(a);h=h.join("");c.mapMaskdigitPositions(h,
+b,p);return h},mapMaskdigitPositions:function(a,b,d){a=e.reverse?a.length-d:0;c.maskDigitPosMap={};for(d=0;d<b.length;d++)c.maskDigitPosMap[b[d]+a]=1},callbacks:function(a){var g=c.val(),h=g!==f,k=[g,a,b,e],l=function(a,b,c){"function"===typeof e[a]&&b&&e[a].apply(this,c)};l("onChange",!0===h,k);l("onKeyPress",!0===h,k);l("onComplete",g.length===d.length,k);l("onInvalid",0<c.invalid.length,[g,a,b,c.invalid,e])}};b=a(b);var l=this,f=c.val(),k;d="function"===typeof d?d(c.val(),void 0,b,e):d;l.mask=
+d;l.options=e;l.remove=function(){var a=c.getCaret();l.options.placeholder&&b.removeAttr("placeholder");b.data("mask-maxlength")&&b.removeAttr("maxlength");c.destroyEvents();c.val(l.getCleanVal());c.setCaret(a);return b};l.getCleanVal=function(){return c.getMasked(!0)};l.getMaskedVal=function(a){return c.getMasked(!1,a)};l.init=function(g){g=g||!1;e=e||{};l.clearIfNotMatch=a.jMaskGlobals.clearIfNotMatch;l.byPassKeys=a.jMaskGlobals.byPassKeys;l.translation=a.extend({},a.jMaskGlobals.translation,e.translation);
+l=a.extend(!0,{},l,e);k=c.getRegexMask();if(g)c.events(),c.val(c.getMasked());else{e.placeholder&&b.attr("placeholder",e.placeholder);b.data("mask")&&b.attr("autocomplete","off");g=0;for(var f=!0;g<d.length;g++){var h=l.translation[d.charAt(g)];if(h&&h.recursive){f=!1;break}}f&&b.attr("maxlength",d.length).data("mask-maxlength",!0);c.destroyEvents();c.events();g=c.getCaret();c.val(c.getMasked());c.setCaret(g)}};l.init(!b.is("input"))};a.maskWatchers={};var f=function(){var b=a(this),d={},e=b.attr("data-mask");
+b.attr("data-mask-reverse")&&(d.reverse=!0);b.attr("data-mask-clearifnotmatch")&&(d.clearIfNotMatch=!0);"true"===b.attr("data-mask-selectonfocus")&&(d.selectOnFocus=!0);if(p(b,e,d))return b.data("mask",new n(this,e,d))},p=function(b,d,e){e=e||{};var c=a(b).data("mask"),f=JSON.stringify;b=a(b).val()||a(b).text();try{return"function"===typeof d&&(d=d(b)),"object"!==typeof c||f(c.options)!==f(e)||c.mask!==d}catch(w){}},k=function(a){var b=document.createElement("div");a="on"+a;var e=a in b;e||(b.setAttribute(a,
+"return;"),e="function"===typeof b[a]);return e};a.fn.mask=function(b,d){d=d||{};var e=this.selector,c=a.jMaskGlobals,f=c.watchInterval;c=d.watchInputs||c.watchInputs;var k=function(){if(p(this,b,d))return a(this).data("mask",new n(this,b,d))};a(this).each(k);e&&""!==e&&c&&(clearInterval(a.maskWatchers[e]),a.maskWatchers[e]=setInterval(function(){a(document).find(e).each(k)},f));return this};a.fn.masked=function(a){return this.data("mask").getMaskedVal(a)};a.fn.unmask=function(){clearInterval(a.maskWatchers[this.selector]);
+delete a.maskWatchers[this.selector];return this.each(function(){var b=a(this).data("mask");b&&b.remove().removeData("mask")})};a.fn.cleanVal=function(){return this.data("mask").getCleanVal()};a.applyDataMask=function(b){b=b||a.jMaskGlobals.maskElements;(b instanceof a?b:a(b)).filter(a.jMaskGlobals.dataMaskAttr).each(f)};k={maskElements:"input,td,span,div",dataMaskAttr:"*[data-mask]",dataMask:!0,watchInterval:300,watchInputs:!0,keyStrokeCompensation:10,useInput:!/Chrome\/[2-4][0-9]|SamsungBrowser/.test(window.navigator.userAgent)&&
+k("input"),watchDataMask:!1,byPassKeys:[9,16,17,18,36,37,38,39,40,91],translation:{0:{pattern:/\d/},9:{pattern:/\d/,optional:!0},"#":{pattern:/\d/,recursive:!0},A:{pattern:/[a-zA-Z0-9]/},S:{pattern:/[a-zA-Z]/}}};a.jMaskGlobals=a.jMaskGlobals||{};k=a.jMaskGlobals=a.extend(!0,{},k,a.jMaskGlobals);k.dataMask&&a.applyDataMask();setInterval(function(){a.jMaskGlobals.watchDataMask&&a.applyDataMask()},k.watchInterval)},window.jQuery,window.Zepto);
diff --git a/view/adminhtml/web/js/recipients.js b/view/adminhtml/web/js/recipients.js
index f9501062..f6b2d9c5 100644
--- a/view/adminhtml/web/js/recipients.js
+++ b/view/adminhtml/web/js/recipients.js
@@ -1,409 +1,813 @@
 require([
+    'Magento_Ui/js/modal/alert',
     'jquery',
-    'jquery/ui'
-], function ($) {
+    'jquery/ui',
+    'mage/translate',
+    'loader',
+    'pagarmeJqueryMask'
+], function (alert, $) {
     'use strict';
 
-    $(document).ready(function(){
-        $("#form-recipients").submit(formSubmit);
+    const
+        cpfMask = '000.000.000-00',
+        cnpjMax = 18, // Includes punctuation due to the mask
+        cnpjMask = '00.000.000/0000-00',
+        errorTitle = $.mage.__('Error!'),
+        fieldDataAttr = {
+            datepicker: '[data-datepicker]',
+            toggleRequired: '[data-toggle-required]'
+        },
+        fieldId = {
+            seller: '#webkul-seller',
+            recipientId: '#recipient-id',
+            documentType: '#document-type',
+            document: '#document',
+            transferEnabled: '#transfer-enabled',
+            transferInterval: '#transfer-interval',
+            companyName: '#recipient-company-name',
+            email: '#recipient-email',
+            birthdate: '#recipient-birthdate',
+            corporationType: '#recipient-corporation-type',
+            holderDocumentType: '#holder-document-type',
+            holderDocument: '#holder-document',
+            holderName: '#holder-name'
+        };
 
-        hideMainInformations();
-        hideElementByMenuSelectValue(
-            $("#existing_recipient").val(),
-            "pagarme_id"
-        );
-        $('#recipient-id').attr('disabled', true);
+    $(document).ready(function () {
 
-        $("#existing_recipient").on('change', function () {
-            $('#recipient-id').attr('disabled', $(this).val() == 0 ? true : false);
+        localizeDatePickerToPtBr();
+        applyDatePickerToField(fieldDataAttr['datepicker']);
+        maskFields();
 
-            hideElementByMenuSelectValue(
-                $(this).val(),
-                "pagarme_id"
-            )
-        });
+        $('#pagarme-recipients-form').on('submit', formSubmit);
 
-        $("#select-webkul-seller").on('change', function () {
-            const externalId = $('#select-webkul-seller').val();
-            $('#external-id').val(
-                externalId
-            );
-            $( "#external-id" ).prop( "readonly", !!externalId );
+        $('#existing_recipient').on('change', function () {
+            slideUpOrDownSectionByFieldVal('pagarme_id', $(this).val());
+        });
 
-            const recipientName = $('#select-webkul-seller')
-                .find(":selected")
-                .attr("sellername");
-            $('#recipient-name').val(
-                recipientName
-            );
-            $( "#recipient-name" ).prop( "readonly", !!recipientName );
+        $(fieldId['seller']).on('change', function () {
+            const webkulId = $(this).val();
+            fillRecipientByWebkulId(webkulId);
 
-            const recipientEmail = $('#select-webkul-seller')
-                .find(":selected")
-                .attr("email");
-            $('#email-recipient').val(
-                recipientEmail
-            );
-            $( "#email-recipient" ).prop( "readonly", !!recipientEmail );
+            if (!webkulId) {
+                slideUpOrDownSections(''); // Hide all sections
+                return;
+            }
 
-            const recipientDocument = $('#select-webkul-seller')
-                .find(":selected")
-                .attr("document");
+            slideUpOrDownSections('seller', 'show');
+        });
 
-            $("#document").val(
-                recipientDocument
-            );
+        $(fieldId['documentType']).on('change', function () {
+            const documentType = $(this).val();
+            changeDocumentFieldsByType(documentType);
+            slideUpOrDownSections(['individual', 'corporation']);
+            if (documentType !== '') {
+                slideUpOrDownSections(documentType, 'show');
+                return;
+            }
+            $(this).removeClass('readonly');
+        });
 
-            $("#document-type").val(getDocumentTypeByDocument(recipientDocument));
-            $( "#document-type" ).addClass('readonly');
+        $(fieldId['document'])
+            .on('keyup change', function () {
+                $(fieldId['holderDocument'])
+                    .val($(this).val()).trigger('input');
+            })
+            .on('change', function () {
+                const documentNumber = $(this).val();
+                if (documentNumber.length === cnpjMax) {
+                    getCnpjData(documentNumber);
+                }
+                if (documentNumber === '') {
+                    $(this).attr('readonly', false);
+                }
+            });
 
-            $("#holder-document-type").val(getDocumentTypeByDocument(recipientDocument));
-            $("#holder-document-type").addClass('readonly');
+        $('#recipient-name, #recipient-company-name').on('change', function () {
+            $(fieldId['holderName']).val($(this).val());
+        });
 
-            $("#holder-document").val(
-                recipientDocument
-            );
+        $('[data-cep-search]').on('change', function () {
+            const cepNumber = $(this).val().replace(/\D/g, '');
+            if (cepNumber.length === 8) {
+                getCepData($(this), cepNumber);
+            }
+        });
 
-            $("#document").prop( "readonly", !!recipientDocument );
-            $("#holder-document").prop( "readonly", !!recipientDocument );
+        $('[data-state]').on('change', function () {
+            const stateCode = $(this).val();
 
-            if (externalId == "") {
-                $("#document-type").removeClass('readonly');
-                $("#holder-document-type").removeClass('readonly');
-                hideMainInformations();
+            if (!stateCode) {
                 return;
             }
 
-            showMainInformations();
+            const addressFieldset = $(this).closest('.admin__fieldset'),
+                citiesListId = addressFieldset.find('datalist[id$="-cities"]').attr('id');
+            let citiesList = '';
+
+            $.get(`https://servicodados.ibge.gov.br/api/v1/localidades/estados/${stateCode}/distritos`)
+                .done(function (data) {
+                    $.each(data, function (index) {
+                        citiesList += `<option value="${data[index].nome}">${data[index].nome}</option>`;
+                    });
+                    fillDatalistOptions(citiesListId, citiesList);
+                });
         });
 
-        hideElementByMenuSelectValue(
-            $("#transfer-enabled").val(),
-            "transfer-interval-div"
-        );
+        $(fieldId['transferEnabled']).on('change', function () {
+            slideUpOrDownSectionByFieldVal('transfer_interval', $(this).val());
+        });
 
-        $("#transfer-enabled").on('change', function () {
-            hideElementByMenuSelectValue(
-                $(this).val(),
-                "transfer-interval-div"
-            )
+        $(fieldId['transferInterval']).on('change', function () {
+            slideUpOrDownSections(
+                'transfer_day',
+                $(this).val() === 'Daily' ? 'hide' : 'show'
+            );
+            fillTransferDayValuesByTransferInterval();
         });
 
-        hideElementByMenuSelectValue(
-            $("#transfer-enabled").val(),
-            "transfer-day-div"
-        );
+        const editRecipient = $('#edit-recipient').val();
+        if (editRecipient.length > 0) {
+            $('#webkul-seller-container').hide();
+            const parsedRecipient = JSON.parse(editRecipient);
+            loadRecipient(parsedRecipient);
+            updateStatusModal(parsedRecipient);
+        }
 
-        $("#transfer-enabled").on('change', function () {
-            hideElementByMenuSelectValue(
-                $(this).val(),
-                "transfer-day-div"
-            )
-        });
+        $(fieldId['recipientId']).on('change', function () {
+            const
+                recipientVal = $(this).val(),
+                controlValue = $('#recipient-id-control').val();
+            if (controlValue === '' || recipientVal === controlValue) {
+                return;
+            }
 
-        $("#document-type").on('change', function() {
-            fillTypeValueByDocumentType();
-            changeDocumentSizeByDocumentType();
+            resetFields();
         });
 
-        $("#transfer-interval").on('change', function () {
-            fillTransferDayValuesByTransferInterval();
-        });
+        $('#search-recipient-id').on('click', searchRecipient);
+    });
 
-        fillFieldsWithSameValue();
+    function changeDocumentFieldsByType(documentType) {
+        const documentMask = documentType === 'corporation' ? cnpjMask : cpfMask;
 
-        changeDocumentSizeByDocumentType();
+        $(fieldId['holderDocumentType'])
+            .val(documentTypeCorporationToCompany(documentType));
 
-        var editRecipient = $("#edit-recipient").val();
-        if (editRecipient.length > 0) {
-            $("#select-seller").hide();
-            loadRecipient(JSON.parse(editRecipient),false);
-        }
+        $('#document, #holder-document')
+            .attr('placeholder', documentMask)
+            .mask(documentMask);
+    }
 
-        $("#search-recipient-id").on('click', searchRecipient);
-    });
+    function documentTypeCorporationToCompany(documentType) {
+        return documentType === 'corporation' ? 'company' : documentType;
+    }
+
+    function documentTypeCompanyToCorporation(documentType) {
+        return documentType === 'company' ? 'corporation' : documentType;
+    }
+
+    function getNameFieldByDocumentType(documentType) {
+        return documentType === 'individual' ? '#recipient-name' : fieldId['companyName'];
+    }
 
     function getDocumentTypeByDocument(document) {
-        let value = 'cpf';
+        let value = '';
         if (document) {
-            document = document.toString().replace(/[^0-9]/g, '');
-            if ( document.length > 11 ) {
-                value = 'cnpj';
+            value = 'individual';
+            document = document.toString().replace(/\D/g, '');
+            if (document.length > 11) {
+                value = 'corporation';
             }
         }
         return value;
     }
 
+    function fillRecipientByWebkulId(webkulId) {
+        showLoader();
+
+        $('#webkul-id')
+            .val(webkulId)
+            .prop('readonly', !!webkulId);
+
+        const
+            selectedWebkulSeller = $(fieldId['seller']).find(':selected'),
+            recipientDocument = selectedWebkulSeller.attr('data-document'),
+            documentType = getDocumentTypeByDocument(recipientDocument);
+        $('#document-type, #holder-document-type')
+            .val(documentType)
+            .trigger('change');
+        $(fieldId['document'])
+            .val(recipientDocument)
+            .trigger('input')
+            .trigger('change');
+        $(fieldId['holderDocument'])
+            .val(documentTypeCorporationToCompany(recipientDocument))
+            .trigger('input');
+
+        const recipientName = selectedWebkulSeller.attr('data-sellername');
+        $(getNameFieldByDocumentType(documentType))
+            .val(recipientName)
+            .trigger('change');
+
+        const recipientEmail = selectedWebkulSeller.attr('data-email');
+        $(fieldId['email'])
+            .val(recipientEmail);
+
+        const recipientBirthdate = selectedWebkulSeller.attr('data-birthdate');
+        $(fieldId['birthdate'])
+            .val(formatDate(recipientBirthdate));
+
+        hideLoader();
+    }
+
+    function getCnpjData(documentNumber) {
+        documentNumber = documentNumber.replace(/\D/g, '');
+        const maxRequests = 3;
+        let requests = 0;
+        $.ajax({
+            url: `https://brasilapi.com.br/api/cnpj/v1/${documentNumber}`,
+            method: 'get',
+            showLoader: true,
+            beforeSend: function (xhr) {
+                // Empty to remove Magento's default handler
+            },
+            statusCode: {
+                404: function (response) {
+                    if (response.responseJSON.type === 'service_error') {
+                        requests++;
+                        if (requests < maxRequests) {
+                            setTimeout($(fieldId['document']).trigger('change'), 50);
+                        }
+                    }
+                }
+            }
+        }).done(function (data) {
+            fillCompanyData(data);
+        }).fail(function (data) {
+            console.error(data);
+        });
+    }
+
+    function fillCompanyData(cnpjData) {
+        if (cnpjData['qsa']) {
+            let partnersList = '';
+            $.each(cnpjData['qsa'], function (index) {
+                partnersList += `<option value="${capitalizeAllWords(cnpjData['qsa'][index]['nome_socio'])}">
+                    ${cnpjData['qsa'][index]['qualificacao_socio']}</option>`;
+            });
+            fillDatalistOptions('recipient-partner-0-partners-list', partnersList);
+        }
+
+        const phoneNumber = [
+            cnpjData['ddd_telefone_1'],
+            cnpjData['ddd_telefone_2']
+        ];
+
+        $(fieldId['companyName']).val(capitalizeAllWords(cnpjData['razao_social'])).trigger('change');
+        $('#recipient-trading-name').val(capitalizeAllWords(cnpjData['nome_fantasia']));
+        $('#recipient-founding-date').val(formatDate(cnpjData['data_inicio_atividade']));
+        $(fieldId['corporationType']).val(cnpjData['natureza_juridica']);
+        $('#recipient-phones-type-0').val(phoneNumber[0].length === 10 ? 'home_phone' : 'mobile_phone');
+        $('#recipient-phones-number-0').val(phoneNumber[0]).trigger('input');
+        $('#recipient-phones-type-1').val(phoneNumber[1].length === 10 ? 'home_phone' : 'mobile_phone');
+        $('#recipient-phones-number-1').val(phoneNumber[1]).trigger('input');
+        $('#company-zip-code').val(cnpjData['cep']).trigger('change').trigger('input');
+        $('#company-street-number').val(cnpjData['numero']);
+        $('#company-complementary').val(capitalizeAllWords(cnpjData['complemento']));
+        if (cnpjData['qsa'].length) {
+            $('#recipient-partner-0-name').val(capitalizeAllWords(cnpjData['qsa'][0]['nome_socio']));
+            $('#recipient-partner-0-professional-occupation').val(cnpjData['qsa'][0]['qualificacao_socio'])
+        }
+    }
+
+    function getCepData(element, cepNumber) {
+        $.ajax({
+            url: `https://viacep.com.br/ws/${cepNumber}/json/`,
+            method: 'get',
+            showLoader: true,
+            beforeSend: function (xhr) {
+                // Empty to remove Magento's default handler
+            }
+        }).done(function (data) {
+            fillAddressFields(element.closest('.admin__fieldset'), data)
+        }).fail(function (data) {
+            console.error(data)
+        });
+    }
+
+    function fillAddressFields(addressFieldset, cepData) {
+        addressFieldset.find('input[id$="-street"]').val(cepData.logradouro);
+        addressFieldset.find('input[id$="-neighborhood"]').val(cepData.bairro);
+        addressFieldset.find('select[id$="-state"]').val(cepData.uf).trigger('change');
+        addressFieldset.find('input[id$="-city"]').val(cepData.localidade);
+    }
+
+    function fillDatalistOptions(datalistId, options) {
+        const list = $('#' + datalistId);
+        list.html('');
+        if (options !== '') {
+            list.html(options);
+        }
+    }
+
+    function capitalizeAllWords(sentence) {
+        if (sentence === '') {
+            return '';
+        }
+
+        const array = sentence.split(' ');
+        for (let i = 0; i < array.length; i++) {
+            array[i] = array[i][0].toUpperCase() + array[i].substr(1).toLowerCase();
+        }
+
+        return array.join(' ');
+    }
+
     function searchRecipient(e) {
         e.preventDefault();
+        showLoader();
 
-        var recipientId = $("#recipient-id").val();
-        var url =  $("#url-search-recipient-id").val();
-
-        console.log(JSON.stringify($("#recipient-id").serialize()));
+        const recipientId = $(fieldId['recipientId']).val(),
+            url = $('#url-search-recipient-id').val();
 
         fetch(url, {
-          method: 'POST',
-          headers: {
-            'Accept': 'application/json, text/plain, */*',
-            'Content-Type': 'application/json'
-          },
-          body: JSON.stringify({recipientId})
+            method: 'POST',
+            headers: {
+                'Accept': 'application/json, text/plain, */*',
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify({recipientId})
         }).then(res => res.json())
-          .then(res => {
-              const response = JSON.parse(res);
-              if (response.code != 200) {
-                  alert(response.message);
-                  return;
-              }
+            .then(res => {
+                const response = JSON.parse(res);
+                if (response.code !== 200) {
+                    hideLoader();
+                    mageAlert(response.message, errorTitle);
+                    return;
+                }
+
+                loadRecipient(response.recipient);
+                $('#recipient-id-control').val(recipientId);
 
-              loadRecipient(response.recipient, true);
-          });
+                hideLoader();
+            });
 
     }
 
     function formSubmit(e) {
         e.preventDefault();
 
-        var isValidEmail = validateEmail($("#email-recipient").val());
-
-        if(!isValidEmail) {
-            alert("Invalid email");
+        if (!validateEmail($("#recipient-email").val())) {
+            mageAlert($.mage.__('Invalid email.'), errorTitle);
             return;
         }
 
-        toogleSaveButton();
-
-        var dataSerialize = jQuery(this).serialize();
-        var url =  $("#url-post").val();
+        toggleSaveButton();
 
         jQuery.ajax({
             method: "POST",
-            url: url,
+            url: $('#url-post').val(),
             contentType: 'application/json',
-            data : JSON.stringify(dataSerialize),
-            success: function(data) {
+            data: JSON.stringify(jQuery(this).serialize()),
+            success: function (data) {
                 data = JSON.parse(data);
                 if (data.code === 200) {
-                    alert(data.message);
-                    return window.history.back();
+                    mageAlert(data.message, $.mage.__('Recipient registered successfully!'), true);
+                    return;
                 }
-                alert(data.message);
+                mageAlert(data.message, errorTitle);
             },
             complete: function () {
-                toogleSaveButton()
+                toggleSaveButton()
             }
         });
     }
 
-    function toogleSaveButton()
-    {
-        var disabled = $("#save-button").prop('disabled');
-        if (disabled) {
-            $("#save-button").attr('disabled', false);
-            $("#save-button span").html("Save");
+    function toggleSaveButton() {
+        const saveButton = $('#save-button'),
+            saveButtonSpan = $('#save-button span');
+        if (saveButton.prop('disabled')) {
+            saveButton.attr('disabled', false);
+            saveButtonSpan.html('Save');
             return;
         }
-        $("#save-button").attr('disabled', true);
-        $("#save-button span").html("Saving");
+        saveButton.attr('disabled', true);
+        saveButtonSpan.html('Saving');
     }
 
-    function hideElementByMenuSelectValue(value, elementIdToHide)
-    {
-        document.getElementById(elementIdToHide).style.display
-            = value == 1 ? 'block' : 'none';
-    }
-
-    function hideMainInformations(){
-        const mainInformationTags = [
-            '#document-div',
-            '#document-type-div',
-            '#email-recipient-div',
-            '#recipient-name-div',
-            '#external-id-div'
-        ];
-
-        mainInformationTags.forEach(tag => {
-            hideElement(
-                $(tag)
-            );
+    function hideSection(section) {
+        const fields = section ? $(`[data-section*="${section}"]`) : $('[data-section]');
+        fields.each(function () {
+            $(this)
+                .hide()
+                .find(fieldDataAttr['toggleRequired']).prop('required', false);
         });
     }
 
-    function showMainInformations(){
-        const mainInformationTags = [
-            '#document-div',
-            '#document-type-div',
-            '#email-recipient-div',
-            '#recipient-name-div',
-            '#external-id-div'
-        ];
-
-        mainInformationTags.forEach(tag => {
-            showElement(
-                $(tag)
-            );
-        });
+    function slideUpOrDownSectionByFieldVal(section, value) {
+        slideUpOrDownSections(section, value === '1' ? 'show' : 'hide');
     }
 
-    function hideElement(element){
-        element.hide();
-    }
+    function slideUpOrDownSections(sections, action = 'hide') {
+        let fields;
+        if (Array.isArray(sections)) {
+            let dataSections = '';
+            $.each(sections, function (key, val) {
+                dataSections += `[data-section*="${val}"]`;
+                dataSections += (key < sections.length - 1) ? ', ' : '';
+            });
+            fields = $(dataSections);
+        } else {
+            fields = sections ? $(`[data-section*="${sections}"]`) : $('[data-section]');
+        }
+
+        if (action === 'hide') {
+            fields.each(function () {
+                $(this)
+                    .slideUp('250')
+                    .find(fieldDataAttr['toggleRequired']).prop('required', false);
+            });
+        }
 
-    function showElement(element){
-        element.show();
+        if (action === 'show') {
+            fields.each(function () {
+                $(this)
+                    .slideDown('250')
+                    .find(fieldDataAttr['toggleRequired']).prop('required', true);
+            });
+        }
     }
 
-    function fillFieldsWithSameValue()
-    {
-        $("#document-type").on('change', function() {
-            $("#holder-document-type").val($(this).val());
-        });
+    function fillTransferDayValuesByTransferInterval() {
+        const transferDay = $('#transfer-day'),
+            transferDayValue = $("#transfer-interval").val();
+
+        if (transferDayValue === 'Weekly') {
+            const transferWeekDays = {
+                1: 'Segunda-feira',
+                2: 'Terça-feira',
+                3: 'Quarta-feira',
+                4: 'Quinta-feira',
+                5: 'Sexta-feira'
+            };
+            transferDay.children().remove();
+            $.each(transferWeekDays, function (value, label) {
+                transferDay.append(`<option value="${value}">${label}</option>`);
+            });
+        }
 
-        $("#document").on('change', function() {
-            $("#holder-document").val($(this).val());
-        });
+        if (transferDayValue === 'Monthly') {
+            transferDay.children().remove();
+            for (let i = 1; i < 32; i++) {
+                transferDay.append(`<option value="${i}">${i}</option>`);
+            }
+        }
 
-        $("#holder-document").attr("readonly", true);
-        $("#holder-document-type").attr("readonly", true);
+        if (transferDayValue === 'Daily') {
+            transferDay.children().remove().end().append('<option value="0">0</option>');
+        }
     }
 
-    function fillTypeValueByDocumentType()
-    {
-        var documentTypeValue = $("#document-type").val();
-        document.getElementById("type").value
-            = documentTypeValue == 'cpf' ? 'individual' : 'company';
+    function validateEmail(email) {
+        const validationExpression = /\S+@\S+\.\S+/;
+        return validationExpression.test(email);
     }
 
-    function fillTransferDayValuesByTransferInterval()
-    {
-        var transferDayValue = $("#transfer-interval").val();
+    function isNewRecipientId(recipient) {
+        return $.type(recipient.register_information) === 'object';
+    }
 
-        if (transferDayValue == 'Weekly') {
-            $('#transfer-day').children().remove().end().append( '<option value="1">1</option>' );
-            for (var i = 2; i < 6; i++) {
-                $('#transfer-day').append( '<option value="' + i + '">' + i + '</option>' );
+    function buildRecipientObject(recipient) {
+        const recipientObject = {};
+        if (isNewRecipientId(recipient)) {
+            recipientObject[fieldId['documentType']] =
+                documentTypeCompanyToCorporation(recipient.register_information.type);
+            recipientObject[fieldId['document']] = recipient.register_information.document;
+            recipientObject[fieldId['email']] = recipient.register_information.email;
+            recipientObject['#recipient-site'] = recipient.register_information.site_url;
+
+            $.each(recipient.register_information.phone_numbers, function (index, phone) {
+                recipientObject['#recipient-phones-type-' + index] = phone.type;
+                recipientObject['#recipient-phones-number-' + index] = phone.ddd + phone.number;
+            });
+
+            switch (recipient.register_information.type) {
+                case 'individual':
+                    recipientObject['#recipient-name'] = recipient.register_information.name;
+                    recipientObject['#recipient-mother-name'] = recipient.register_information.mother_name;
+                    recipientObject[fieldId['birthdate']] = formatDate(recipient.register_information.birthdate);
+                    recipientObject['#recipient-monthly-income'] = recipient.register_information.monthly_income;
+                    recipientObject['#recipient-professional-occupation'] =
+                        recipient.register_information.professional_occupation;
+
+                    recipientObject['#recipient-zip-code'] = recipient.register_information.address.zip_code;
+                    recipientObject['#recipient-street'] = recipient.register_information.address.street;
+                    recipientObject['#recipient-street-number'] = recipient.register_information.address.street_number;
+                    recipientObject['#recipient-complementary'] = recipient.register_information.address.complementary;
+                    recipientObject['#recipient-reference-point'] =
+                        recipient.register_information.address.reference_point;
+                    recipientObject['#recipient-neighborhood'] = recipient.register_information.address.neighborhood;
+                    recipientObject['#recipient-state'] = recipient.register_information.address.state;
+                    recipientObject['#recipient-city'] = recipient.register_information.address.city;
+                    break;
+                case 'company':
+                case 'corporation':
+                    recipientObject[fieldId['companyName']] = recipient.register_information.company_name;
+                    recipientObject['#recipient-trading-name'] = recipient.register_information.trading_name;
+                    recipientObject['#recipient-annual-revenue'] = recipient.register_information.annual_revenue;
+                    recipientObject[fieldId['corporationType']] = recipient.register_information.corporation_type;
+                    recipientObject['#recipient-founding-date'] =
+                        formatDate(recipient.register_information.founding_date);
+
+                    recipientObject['#company-zip-code'] = recipient.register_information.main_address.zip_code;
+                    recipientObject['#company-street'] = recipient.register_information.main_address.street;
+                    recipientObject['#company-street-number'] =
+                        recipient.register_information.main_address.street_number;
+                    recipientObject['#company-complementary'] =
+                        recipient.register_information.main_address.complementary;
+                    recipientObject['#company-reference-point'] =
+                        recipient.register_information.main_address.reference_point;
+                    recipientObject['#company-neighborhood'] =
+                        recipient.register_information.main_address.neighborhood;
+                    recipientObject['#company-state'] = recipient.register_information.main_address.state;
+                    recipientObject['#company-city'] = recipient.register_information.main_address.city;
+                    break;
             }
+
+            $.each(recipient.register_information.managing_partners, function (partnerIndex, partner) {
+                const idPrefix = `#recipient-partner-${partnerIndex}`;
+                recipientObject[`${idPrefix}-name`] = partner.name;
+                recipientObject[`${idPrefix}-document-type`] = partner.type;
+                recipientObject[`${idPrefix}-document`] = partner.document;
+                recipientObject[`${idPrefix}-mother-name`] = partner.mother_name;
+                recipientObject[`${idPrefix}-email`] = partner.email;
+                recipientObject[`${idPrefix}-birthdate`] = formatDate(partner.birthdate);
+                recipientObject[`${idPrefix}-monthly-income`] = partner.monthly_income;
+                recipientObject[`${idPrefix}-professional-occupation`] = partner.professional_occupation;
+                recipientObject[`${idPrefix}-declaration`] = partner.self_declared_legal_representative;
+
+                recipientObject[`${idPrefix}-zip-code`] = partner.address.zip_code;
+                recipientObject[`${idPrefix}-street`] = partner.address.street;
+                recipientObject[`${idPrefix}-street-number`] = partner.address.street_number;
+                recipientObject[`${idPrefix}-complementary`] = partner.address.complementary;
+                recipientObject[`${idPrefix}-reference-point`] = partner.address.reference_point;
+                recipientObject[`${idPrefix}-neighborhood`] = partner.address.neighborhood;
+                recipientObject[`${idPrefix}-state`] = partner.address.state;
+                recipientObject[`${idPrefix}-city`] = partner.address.city;
+
+                $.each(partner.phone_numbers, function (phoneIndex, phone) {
+                    recipientObject[`${idPrefix}-phones-type-` + phoneIndex] = phone.type;
+                    recipientObject[`${idPrefix}-phones-number-` + phoneIndex] = phone.ddd + phone.number;
+                });
+            });
+
+            recipientObject[fieldId['holderDocument']] = recipient.register_information.document;
         }
 
-        if (transferDayValue == 'Monthly') {
-            $('#transfer-day').children().remove().end().append( '<option value="1">1</option>' );
-            for (var i = 2; i < 32; i++) {
-                $('#transfer-day').append('<option value="' + i + '">' +  i + '</option>');
-            }
+        if (!isNewRecipientId(recipient)) {
+            recipientObject[fieldId['documentType']] = documentTypeCompanyToCorporation(recipient.type);
+            recipientObject[fieldId['document']] = recipient.document;
+            recipientObject[getNameFieldByDocumentType(recipient.type)] = recipient.name;
+            recipientObject[fieldId['email']] = recipient.email;
+
+            recipientObject[fieldId['holderDocument']] = recipient.document;
         }
 
-        if (transferDayValue == 'Daily') {
-            $('#transfer-day').children().remove().end().append( '<option value="0">0</option>' );
+        recipientObject['#pagarme-status'] = recipient.status;
+        recipientObject['#status-label'] = recipient.statusLabel;
+
+        recipientObject[fieldId['holderName']] = recipient.default_bank_account.holder_name;
+        recipientObject[fieldId['holderDocumentType']] =
+            documentTypeCorporationToCompany(recipient.default_bank_account.holder_type);
+        recipientObject['#bank'] = recipient.default_bank_account.bank;
+        recipientObject['#branch-number'] = recipient.default_bank_account.branch_number;
+        recipientObject['#branch-check-digit'] = recipient.default_bank_account.branch_check_digit;
+        recipientObject['#account-number'] = recipient.default_bank_account.account_number;
+        recipientObject['#account-check-digit'] = recipient.default_bank_account.account_check_digit;
+        recipientObject['#account-type'] = recipient.default_bank_account.type;
+
+        recipientObject[fieldId['transferEnabled']] = recipient.transfer_settings.transfer_enabled ? 1 : 0;
+        recipientObject[fieldId['transferInterval']] = recipient.transfer_settings.transfer_interval;
+        recipientObject['#transfer-day'] = recipient.transfer_settings.transfer_day;
+
+        return recipientObject;
+    }
+
+    function triggerChangeToShowFields(elementId) {
+        const changeElements = [
+            fieldId['documentType'],
+            fieldId['transferEnabled'],
+            fieldId['transferInterval']
+        ];
+        if ($.inArray(elementId, changeElements) >= 0) {
+            $(elementId).trigger('change');
         }
     }
 
-    function validateEmail(email) {
-        var validationExpression = /\S+@\S+\.\S+/;
-        return validationExpression.test(email);
+    function blockElement(element) {
+        const neverBlockIds = [
+            'webkul-seller',
+            'existing_recipient',
+            'recipient-id'
+        ];
+        if ($.inArray(element.attr('id'), neverBlockIds) >= 0) {
+            return;
+        }
+
+        if (element.is('select')) {
+            element.addClass('readonly');
+        } else {
+            element.attr('readonly', true);
+        }
+
+        if (element.is(fieldDataAttr['datepicker'])) {
+            element.datepicker('destroy');
+        }
     }
 
-    function changeDocumentSizeByDocumentType() {
-        var documentType = $("#document-type").val();
+    function unblockElement(element) {
+        const
+            neverUnblockIds = [
+                'holder-name',
+                'holder-document-type',
+                'holder-document'
+            ],
+            elementId = element.attr('id');
+        if ($.inArray(elementId, neverUnblockIds) >= 0) {
+            return;
+        }
 
-        if (documentType == "cpf") {
-            $("#document").attr("maxlength", 11);
+        if (element.is('select')) {
+            element.removeClass('readonly');
+        } else {
+            element.attr('readonly', false);
         }
 
-        if (documentType == "cnpj") {
-            $("#document").attr("maxlength", 14);
+        if (element.is(fieldDataAttr['datepicker'])) {
+            applyDatePickerToField(`#${elementId}`);
         }
     }
 
-    function buildRecipientObject(recipient){
-        return {
-            "#holder-name": recipient.default_bank_account.holder_name,
-            "#holder-document-type": recipient.default_bank_account.holder_type == 'individual' ? 'cpf' : 'cnpj',
-            "#holder-document":recipient.document,
-            "#bank": recipient.default_bank_account.bank,
-            "#branch-number": recipient.default_bank_account.branch_number,
-            "#branch-check-digit": recipient.default_bank_account.branch_check_digit,
-            "#account-number": recipient.default_bank_account.account_number,
-            "#account-check-digit": recipient.default_bank_account.account_check_digit,
-            "#account-type": recipient.default_bank_account.type,
-            "#transfer-enabled": recipient.transfer_settings.transfer_enabled ? 1 : 0,
-            "#transfer-interval": recipient.transfer_settings.transfer_interval,
-            "#transfer-day": recipient.transfer_settings.transfer_day
-        };
+    function resetFields() {
+        const neverResetIds = [
+                'webkul-seller',
+                'webkul-id',
+                'existing_recipient',
+                'recipient-id'
+            ],
+            fields = $('.admin__fieldset input[id], .admin__fieldset select[id]');
+
+        $.each(fields, function (key, field) {
+            field = $(field);
+            if ($.inArray(field.attr('id'), neverResetIds) >= 0) {
+                return;
+            }
+
+            if (field.is('select')) {
+                field.prop('selectedIndex', 0).trigger('change');
+            } else {
+                field.val('');
+            }
+            unblockElement(field);
+        });
+
+        $(fieldId['holderName']).val($('#webkul-seller :selected').attr('data-sellername'));
     }
 
-    function loadRecipient(recipient, wasSearched) {
+    function loadRecipient(recipient) {
         const recipientObject = buildRecipientObject(recipient);
 
         for (const elementId in recipientObject) {
-            if (!Object.hasOwnProperty.call(recipientObject, elementId))
+            if (!Object.hasOwnProperty.call(recipientObject, elementId)) {
                 continue;
+            }
 
             const recipientValue = recipientObject[elementId];
             const element = $(elementId);
-            element.val(recipientValue);
-            if (wasSearched) {
-                element.attr("readonly", true);
-                if (element.is('select')) {
-                    element.addClass('readonly');
-                }
-            }
-
+            element.val(recipientValue)
+                .trigger('input');
 
+            triggerChangeToShowFields(elementId);
         }
 
-        fillTransferDayValuesByTransferInterval();
-
-        hideElementByMenuSelectValue(
-            $("#transfer-enabled").val(),
-            "transfer-day-div"
-        );
+        if (!isNewRecipientId(recipient)) {
+            hideSection('new-field');
+        }
 
-        hideElementByMenuSelectValue(
-            $("#transfer-enabled").val(),
-            "transfer-interval-div"
-        );
+        const fields = $('.admin__fieldset input[id], .admin__fieldset select[id]');
+        $.each(fields, function (key, field) {
+            blockElement($(field));
+        });
+    }
 
-        $('#recipient-id').attr('disabled', false);
+    function mageAlert(content, title = null, shouldGoBack = false) {
+        let alertObject = {
+            title: title,
+            content: content,
+            modalClass: 'pagarme-recipient-modal',
+        };
+        if (shouldGoBack) {
+            alertObject.actions = {
+                always: function () {
+                    showLoader();
+                    $('#back').trigger('click');
+                }
+            }
+        }
+        alert(alertObject);
+    }
 
-        $("#document").attr("readonly", true);
-        $("#document-type").attr("readonly", true);
+    function showLoader() {
+        $('body').loader('show');
+    }
 
-        if (wasSearched) return;
+    function hideLoader() {
+        $('body').loader('hide');
+    }
 
-        $('#external-id').val(recipient.externalId);
-        $("#external-id").attr("readonly", true);
-        $("#external-id-div").show();
+    function phoneMaskBehavior(val) {
+        return val.replace(/\D/g, '').length === 11 ? '(00) 00000-0000' : '(00) 0000-00009';
+    }
 
-        $('#existing_recipient').val('1');
-        $("#existing_recipient").attr("readonly", true);
+    function maskFields() {
+        const phoneMaskOptions = {
+            onKeyPress: function (val, e, field, options) {
+                field.mask(phoneMaskBehavior.apply({}, arguments), options);
+            }
+        };
 
-        $("#use_existing_pagarme_id").hide();
+        $('[data-phone-mask]').mask(phoneMaskBehavior, phoneMaskOptions);
+        $('[data-date-mask]').mask('00/00/0000');
+        $('[data-currency-mask]').mask("#.##0,00", {reverse: true});
+        $('[data-zipcode-mask]').mask('00000-000');
+    }
 
-        $('#pagarme_id').show();
-        $('#recipient-id').val(recipient.id);
+    function formatDate(date) {
+        if (!date) {
+            return date;
+        }
 
-        $("#recipient-name").val(recipient.name);
-        $("#recipient-name").attr("readonly", true);
+        const dateArray = date.split('-');
+        if (dateArray.length === 3) {
+            return `${dateArray[2]}/${dateArray[1]}/${dateArray[0]}`;
+        }
 
-        $('#email-recipient').val(recipient.email);
-        $('#email-recipient').attr("readonly", true);
+        return date;
+    }
 
-        $('#email-recipient').val(recipient.email);
-        $('#email-recipient').attr("readonly", true);
+    function applyDatePickerToField(element) {
+        $(element).datepicker({
+            changeMonth: true,
+            changeYear: true,
+            dateFormat: 'dd/mm/yy',
+            maxDate: 0,
+            minDate: '-122y', // Jeanne Calment
+            showMonthAfterYear: true,
+            yearRange: 'c-122:c0'
+        });
+    }
 
-        $('#email-recipient').val(recipient.email);
-        $('#email-recipient').attr("readonly", true);
+    function localizeDatePickerToPtBr() {
+        if ($('html').attr('lang') !== 'pt') {
+            return;
+        }
 
-        $('#document').val(recipient.document);
-        $('#document').attr("readonly", true);
+        const shortWeekDays = ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'];
+        $.datepicker.setDefaults({
+            closeText: 'Fechar',
+            prevText: 'Anterior',
+            nextText: 'Próximo',
+            currentText: 'Hoje',
+            monthNames: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho',
+                'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
+            monthNamesShort: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun',
+                'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'],
+            dayNames: [
+                'Domingo',
+                'Segunda-feira',
+                'Terça-feira',
+                'Quarta-feira',
+                'Quinta-feira',
+                'Sexta-feira',
+                'Sábado'
+            ],
+            dayNamesShort: shortWeekDays,
+            dayNamesMin: shortWeekDays,
+            weekHeader: 'Sm'
+        });
+    }
 
-        $('#holder-document').val(recipient.document);
-        $('#holder-document').attr("readonly", true);
+    function updateStatusModal(recipient)
+    {
+        if (!recipient.statusUpdated) {
+            return;
+        }
 
-        $('#holder-document-type').val(recipient.default_bank_account.holder_type == 'individual' ? 'cpf' : 'cnpj');
-        $('#holder-document-type').attr("readonly", true);
-        $("#holder-document-type").addClass('readonly');
+        mageAlert(
+            $.mage.__('Recipient had their status updated successfully.'),
+            $.mage.__('Status updated!')
+        );
     }
 
 });
diff --git a/view/adminhtml/web/template/ui/grid/cells/recipientStatus.html b/view/adminhtml/web/template/ui/grid/cells/recipientStatus.html
new file mode 100644
index 00000000..34abf449
--- /dev/null
+++ b/view/adminhtml/web/template/ui/grid/cells/recipientStatus.html
@@ -0,0 +1,9 @@
+
+<div class="data-grid-cell-content"
+     if="!$col.needsValidation($row())"
+     data-bind="attr: { class: $col.getStatusClass($row())}"
+     text="$col.getLabel($row())"></div>
+<a   class="action-menu-item kyc-validation"
+     if="$col.needsValidation($row())"
+     data-bind="click: $col.generateKycLink.bind($col, $row())"
+     text="$col.getLabel($row())"></a>
diff --git a/view/frontend/layout/checkout_index_index.xml b/view/frontend/layout/checkout_index_index.xml
index b53a522d..28ccdc6b 100755
--- a/view/frontend/layout/checkout_index_index.xml
+++ b/view/frontend/layout/checkout_index_index.xml
@@ -54,6 +54,9 @@
                                                                         <item name="pagarme_debit" xsi:type="array">
                                                                              <item name="isBillingAddressRequired" xsi:type="boolean">true</item>
                                                                         </item>
+                                                                        <item name="pagarme_googlepay" xsi:type="array">
+																			<item name="isBillingAddressRequired" xsi:type="boolean">true</item>
+																		</item>
                                                                     </item>
                                                                 </item>
                                                             </item>
diff --git a/view/frontend/layout/marketplace_account_dashboard.xml b/view/frontend/layout/marketplace_account_dashboard.xml
new file mode 100644
index 00000000..59833303
--- /dev/null
+++ b/view/frontend/layout/marketplace_account_dashboard.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * @author      Open Source Team
+ * @copyright   2024 Pagar.me (https://pagar.me)
+ * @license     https://pagar.me Copyright
+ *
+ * @link        https://pagar.me
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <head>
+        <css src="Pagarme_Pagarme/css/pagarme_kyc.css" />
+    </head>
+    <body>
+        <referenceContainer name="content">
+            <block  class="Pagarme\Pagarme\Block\Customer\Marketplace\Kyc"
+                    name="pagarme_marketplace_kyc"
+                    template="customer/marketplace/kyc.phtml"
+                    before="marketplace_account_dashboard"
+                    cacheable="false"
+                    ifconfig="pagarme_pagarme/marketplace/active"/>
+        </referenceContainer>
+    </body>
+</page>
diff --git a/view/frontend/requirejs-config.js b/view/frontend/requirejs-config.js
index 791c4280..80d5d5d2 100644
--- a/view/frontend/requirejs-config.js
+++ b/view/frontend/requirejs-config.js
@@ -6,9 +6,16 @@ var config = {
             }
         }
     },
+    shim : {
+        'Pagarme_Pagarme/js/view/payment/googlepay' : {
+            deps : ['googlePay']
+        }
+    },
     map: {
         '*': {
-            pixCheckoutSuccess: 'Pagarme_Pagarme/js/view/payment/checkout/success/pix'
+            pixCheckoutSuccess: 'Pagarme_Pagarme/js/view/payment/checkout/success/pix',
+            kyc: 'Pagarme_Pagarme/js/view/marketplace/kyc',
+            googlePay: 'https://pay.google.com/gp/p/js/pay.js'
         }
     }
 };
diff --git a/view/frontend/templates/customer/marketplace/kyc.phtml b/view/frontend/templates/customer/marketplace/kyc.phtml
new file mode 100644
index 00000000..6e4a3bcc
--- /dev/null
+++ b/view/frontend/templates/customer/marketplace/kyc.phtml
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @var \Pagarme\Pagarme\Block\Customer\Marketplace\Kyc $block Kyc
+ */
+
+use Pagarme\Core\Marketplace\Interfaces\RecipientInterface;
+
+$recipient = $block->getRecipient();
+$recipientId = $recipient->getId();
+
+if (empty($recipientId) || $recipient->getStatus() !== RecipientInterface::VALIDATION_REQUESTED) {
+    return;
+}
+
+?>
+
+<div class="wk-mp-design">
+    <div class="mp-widgets pagarme-kyc">
+        <div class="container">
+            <div class="pagarme-kyc-box">
+                <div class="pagarme-kyc-box-title">
+                    <div class="p-5"><?= __('Pagar.me Recipient') ?></div>
+                </div>
+                <div class="pagarme-kyc-box-content">
+                    <div class="p-5">
+                        <p><?= __('To activate your balance movement on Pagar.me, complete our <b>security validation</b>.') ?></p>
+                        <p><?= __("<span class='pagarme-alert-text'>Attention!</span> The generated link will be valid for 20 minutes.") ?></p>
+                        <button class="button" id="pagarme-kyc-start-validation">
+                            <span><?= __('Start validation') ?></span>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div id="modal-success-content">
+    <div class="modal-inner-content pagarme-kyc-modal">
+        <p><?= __('Point the smartphone camera to scan the QRCode.') ?></p>
+        <p><img src="" alt="QRCode" id="pagarme-kyc-qrcode" /></p>
+        <p><?= sprintf(__('Or use this %slink%s.'), '<a id="pagarme-kyc-link" target="_blank" rel="noreferrer">', '</a>') ?></p>
+    </div>
+</div>
+
+<div id="modal-error-content">
+    <div class="modal-inner-content pagarme-kyc-modal">
+        <p><?= __('Something went wrong, please try again later.') ?></p>
+    </div>
+</div>
+
+<script type="text/x-magento-init">
+    {
+        "#pagarme-kyc-start-validation": {
+            "kyc": {"id": "<?= $recipientId ?>"}
+        }
+    }
+</script>
diff --git a/view/frontend/templates/info/card.phtml b/view/frontend/templates/info/card.phtml
new file mode 100644
index 00000000..67862452
--- /dev/null
+++ b/view/frontend/templates/info/card.phtml
@@ -0,0 +1,25 @@
+<?php
+    /**
+     * @var \Pagarme\Core\Kernel\Aggregates\Transaction $info
+     */
+    $info =  $this->getTransactionInfo();
+?>
+<span>
+    <?= __($this->getTitle()); ?>
+</span>
+<br /><br />
+<span>
+    <b><?= __('Brand'); ?>: </b>
+    <?= $info['cardBrand']; ?>
+</span><br />
+<span>
+    <b><?= __('Number'); ?>: </b>
+    <?= $info['lastFour']; ?>
+</span>
+<br />
+<?php if (!empty($info['installments'])) : ?>
+    <span>
+        <b><?= __('Installments'); ?>: </b>
+        <?= $info['installments'] ?>
+    </span>
+<?php endif; ?>
\ No newline at end of file
diff --git a/view/frontend/templates/info/creditCard.phtml b/view/frontend/templates/info/creditCard.phtml
deleted file mode 100644
index adbeebaa..00000000
--- a/view/frontend/templates/info/creditCard.phtml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * var Pagarme\Pagarme\Block\Payment\Info\CreditCard $this
- *
- * @author      Open Source Team
- * @copyright   2021 Pagar.me (https://pagar.me)
- * @license     https://pagar.me Copyright
- *
- * @link        https://pagar.me
- */
-
-?>
-<p><?= __($this->getTitle()); ?></p>
-<p>
-    <b><?= __('Brand'); ?>:</b> <?= ucfirst($this->getCcBrand()); ?><br/>
-    <b><?= __('Number'); ?>:</b> <?= $this->getCardLast4(); ?><br/>
-    <b><?= __('Installments'); ?>:</b> <?= $this->getInstallments(); ?>
-</p>
diff --git a/view/frontend/web/css/pagarme_kyc.css b/view/frontend/web/css/pagarme_kyc.css
new file mode 100644
index 00000000..182541fe
--- /dev/null
+++ b/view/frontend/web/css/pagarme_kyc.css
@@ -0,0 +1,46 @@
+.wk-mp-design .mp-widgets.pagarme-kyc {
+    width: 100%;
+}
+
+.pagarme-kyc .container {
+    padding-bottom: 15px;
+}
+
+.pagarme-kyc-box {
+    border:1px solid #ccc;
+}
+
+.pagarme-kyc-box-title {
+    border-bottom: 1px solid #ccc;
+    display: inline-block;
+    width: 100%;
+}
+
+.pagarme-kyc-box-content {
+    padding:5px;
+}
+
+.pagarme-kyc-box-content > div {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+
+.pagarme-kyc-box-content > div button {
+    margin: 2.5rem;
+}
+
+.pagarme-kyc-modal {
+    display: none;
+    padding-top: 3rem;
+    text-align: center;
+}
+
+.pagarme-kyc-modal img {
+    width: 220px;
+}
+
+.pagarme-alert-text {
+    font-weight: bold;
+    color: #cd0909;
+}
\ No newline at end of file
diff --git a/view/frontend/web/js/core/checkout/FormObject.js b/view/frontend/web/js/core/checkout/FormObject.js
index 4666a514..385b3d54 100644
--- a/view/frontend/web/js/core/checkout/FormObject.js
+++ b/view/frontend/web/js/core/checkout/FormObject.js
@@ -331,6 +331,23 @@ define(['jquery'], ($) => {
         return FormObject.FormObject;
     };
 
+    FormObject.googlePayInit = (isMultibuyerEnabled) => {
+
+        FormObject.FormObject = {};
+
+        const containerSelector = '#pagarme_googlepay-form';
+
+        const googlepayElements = {
+            'containerSelector' : containerSelector,
+            "inputAmount" : $(containerSelector + " .cc_amount"),
+            "inputAmountContainer" : $(containerSelector + " .amount-container"),
+        };
+
+        FormObject.FormObject = googlepayElements;
+        FormObject.FormObject.numberOfPaymentForms = 1;
+        return FormObject.FormObject;
+    };
+
     FormObject.boletoInit = (isMultibuyerEnabled) => {
 
         FormObject.FormObject = {};
diff --git a/view/frontend/web/js/core/checkout/PaymentMethodController.js b/view/frontend/web/js/core/checkout/PaymentMethodController.js
index 3be47f9d..fa471215 100644
--- a/view/frontend/web/js/core/checkout/PaymentMethodController.js
+++ b/view/frontend/web/js/core/checkout/PaymentMethodController.js
@@ -12,6 +12,7 @@ define([
     'Pagarme_Pagarme/js/core/models/PixModel',
     'Pagarme_Pagarme/js/core/models/BoletoModel',
     'Pagarme_Pagarme/js/core/models/BoletoCreditcardModel',
+    'Pagarme_Pagarme/js/core/models/GooglePayModel',
     'Pagarme_Pagarme/js/core/validators/CustomerValidator',
 ], (
     $,
@@ -27,6 +28,7 @@ define([
     PixModel,
     BoletoModel,
     BoletoCreditcardModel,
+    GooglePayModel,
     CustomerValidator,
 ) => {
 
@@ -255,6 +257,19 @@ define([
             }
         }
 
+        googlepayInit() {
+            this.platformConfig = PlatformConfig.bind(this.platformConfig);
+            this.formObject = FormObject.googlePayInit(this.platformConfig.isMultibuyerEnabled);
+
+            if (!this.formObject) {
+                return;
+            }
+
+            this.model = new GooglePayModel(this.formObject);
+            this.hideCardAmount(this.formObject);
+            this.removeMultibuyerForm(this.formObject);
+        }
+
         boletoInit() {
             this.platformConfig = PlatformConfig.bind(this.platformConfig);
             this.formObject = FormObject.boletoInit(this.platformConfig.isMultibuyerEnabled);
diff --git a/view/frontend/web/js/core/models/GooglePayModel.js b/view/frontend/web/js/core/models/GooglePayModel.js
new file mode 100644
index 00000000..d62d6cf0
--- /dev/null
+++ b/view/frontend/web/js/core/models/GooglePayModel.js
@@ -0,0 +1,34 @@
+define(['Pagarme_Pagarme/js/core/validators/MultibuyerValidator'], (MultibuyerValidator) => {
+    return class GooglePayModel {
+        constructor(formObject) {
+            this.formObject = formObject;
+            this.errors = [];
+        }
+        
+        placeOrder(placeOrderObject) {
+            this.placeOrderObject = placeOrderObject;
+            this.placeOrderObject.placeOrder();
+        }
+
+        validate() {
+            return true;
+        }
+
+        addErrors(error) {
+            this.errors.push({
+                message: error
+            })
+        }
+
+        getData() {
+            
+            const data = {
+                'method': "pagarme_googlepay",
+                'additional_data': {
+                    "googlepayData": this.placeOrderObject?.data
+                }
+            };
+            return data;
+        }
+    };
+});
diff --git a/view/frontend/web/js/view/marketplace/kyc.js b/view/frontend/web/js/view/marketplace/kyc.js
new file mode 100644
index 00000000..7fd3648a
--- /dev/null
+++ b/view/frontend/web/js/view/marketplace/kyc.js
@@ -0,0 +1,47 @@
+define([
+    'Magento_Ui/js/modal/modal',
+    "mage/url",
+    'jquery',
+    'mage/translate',
+    'loader'
+], function (modal, mageUrl, $) {
+    return function (config) {
+        const successModalOptions = {
+            responsive: true,
+            innerScroll: true,
+            title: $.mage.__('Start validation'),
+            buttons: [{
+                text: $.mage.__('Close'),
+                click: function () {
+                    this.closeModal();
+                }
+            }]
+        };
+        modal(successModalOptions, $('#modal-success-content'));
+
+        const errorModalOptions = { ...successModalOptions };
+        errorModalOptions.title = $.mage.__('Error!');
+        modal(errorModalOptions, $('#modal-error-content'));
+
+        $('#pagarme-kyc-start-validation').on('click', async function (){
+            const body = $('body');
+            try {
+                body.loader('show');
+                const url = mageUrl.build(`rest/V1/pagarme/marketplace/recipient/kyc/link/${config.id}`);
+                const response = await $.get(mageUrl.build(url));
+                body.loader('hide');
+                if (response) {
+                    $('#pagarme-kyc-qrcode').attr('src', response.qr_code);
+                    $('#pagarme-kyc-link').attr('href', response.url);
+                    $('#modal-success-content .pagarme-kyc-modal').show();
+
+                    $('#modal-success-content').modal('openModal');
+                }
+            } catch (exception) {
+                body.loader('hide');
+                $('#modal-error-content .pagarme-kyc-modal').show();
+                $('#modal-error-content').modal('openModal');
+            }
+        });
+    };
+});
diff --git a/view/frontend/web/js/view/payment/default.js b/view/frontend/web/js/view/payment/default.js
index 80800615..387719df 100644
--- a/view/frontend/web/js/view/payment/default.js
+++ b/view/frontend/web/js/view/payment/default.js
@@ -33,7 +33,7 @@ define(
         "Pagarme_Pagarme/js/core/validators/CreditCardValidator",
         "Pagarme_Pagarme/js/core/validators/CustomerValidator",
         "Pagarme_Pagarme/js/core/validators/MultibuyerValidator",
-        "Pagarme_Pagarme/js/core/validators/VoucherCardValidator",
+        "Pagarme_Pagarme/js/core/validators/VoucherCardValidator"
     ],
     function(
         Component,
diff --git a/view/frontend/web/js/view/payment/googlepay.js b/view/frontend/web/js/view/payment/googlepay.js
new file mode 100644
index 00000000..3b406ea5
--- /dev/null
+++ b/view/frontend/web/js/view/payment/googlepay.js
@@ -0,0 +1,175 @@
+define([
+    "Pagarme_Pagarme/js/view/payment/default",
+    "Magento_Checkout/js/model/quote",
+    "Pagarme_Pagarme/js/core/checkout/PaymentModuleBootstrap",
+    "https://pay.google.com/gp/p/js/pay.js",
+], function (Component, quote, PagarmeCore) {
+    "use strict";
+    return Component.extend({
+        defaults: {
+            template: "Pagarme_Pagarme/payment/googlepay",
+        },
+        getCode: function () {
+            return "pagarme_googlepay";
+        },
+        getTitle: function () {
+            return window.checkoutConfig.payment.pagarme_googlepay.title;
+        },
+        getGooglePaymentsClient: function () {
+            let self = this;
+            let environment = "TEST";
+            if (window.checkoutConfig.pagarme_is_sandbox_mode === false) {
+                environment = "PRODUCTION";
+            }
+
+            return new google.payments.api.PaymentsClient({
+                environment: environment,
+            });
+        },
+        addGooglePayButton: function () {
+            let self = this;
+            let paymentsClient = this.getGooglePaymentsClient();
+            const button = paymentsClient.createButton({
+                buttonColor: "default",
+                buttonType: "pay",
+                buttonRadius: 5,
+                buttonLocale: "pt",
+                buttonSizeMode: "fill",
+            });
+            document.getElementById("pagarme-googlepay").appendChild(button);
+        },
+
+        onPaymentAuthorized: function (paymentData) {
+            return new Promise(function (resolve, reject) {
+                processPayment(paymentData)
+                    .then(function () {
+                        resolve({ transactionState: "SUCCESS" });
+                    })
+                    .catch(function () {
+                        resolve({
+                            transactionState: "ERROR",
+                            error: {
+                                intent: "PAYMENT_AUTHORIZATION",
+                                message: "Insufficient funds",
+                                reason: "PAYMENT_DATA_INVALID",
+                            },
+                        });
+                    });
+            });
+        },
+
+        getGooglePaymentDataRequest: function () {
+            const baseRequest = {
+                apiVersion: 2,
+                apiVersionMinor: 0,
+            };
+            const tokenizationSpecification = {
+                type: "PAYMENT_GATEWAY",
+                parameters: {
+                    gateway: "pagarme",
+                    gatewayMerchantId: window.checkoutConfig.pagarme_account_id,
+                },
+            };
+
+            const baseCardPaymentMethod = {
+                type: "CARD",
+                parameters: {
+                    allowedAuthMethods: ["PAN_ONLY"],
+                    allowedCardNetworks:
+                        window.checkoutConfig.payment.pagarme_googlepay
+                            .cardBrands,
+                },
+            };
+            const cardPaymentMethod = Object.assign({}, baseCardPaymentMethod, {
+                tokenizationSpecification: tokenizationSpecification,
+            });
+            const paymentDataRequest = Object.assign({}, baseRequest);
+            paymentDataRequest.allowedPaymentMethods = [cardPaymentMethod];
+            paymentDataRequest.transactionInfo =
+                this.getGoogleTransactionInfo();
+            paymentDataRequest.merchantInfo = {
+                merchantId:
+                    window.checkoutConfig.payment.pagarme_googlepay.merchantId,
+                merchantName:
+                    window.checkoutConfig.payment.pagarme_googlepay
+                        .merchantName,
+            };
+            return paymentDataRequest;
+        },
+
+        onGooglePaymentButtonClicked: function () {
+            const self = this;
+            const paymentDataRequest = this.getGooglePaymentDataRequest();
+            paymentDataRequest.transactionInfo =
+                this.getGoogleTransactionInfo();
+
+            const paymentsClient = this.getGooglePaymentsClient();
+            paymentsClient
+                .loadPaymentData(paymentDataRequest)
+                .then(function (paymentData) {
+                    self.processPayment(paymentData, self);
+                })
+                .catch(function (err) {
+                    if (err.statusCode === "CANCELED") {
+                        return;
+                    }
+                    console.error(err);
+                });
+        },
+
+        getGoogleTransactionInfo: function () {
+            return {
+                countryCode: "BR",
+                currencyCode: quote.totals().base_currency_code,
+                totalPriceStatus: "FINAL",
+                totalPrice: quote.totals().grand_total.toFixed(2),
+            };
+        },
+
+        prefetchGooglePaymentData: function () {
+            const paymentDataRequest = this.getGooglePaymentDataRequest();
+            paymentDataRequest.transactionInfo = {
+                totalPriceStatus: "NOT_CURRENTLY_KNOWN",
+                currencyCode: quote.totals().base_currency_code,
+            };
+            const paymentsClient = this.getGooglePaymentsClient();
+            paymentsClient.prefetchPaymentData(paymentDataRequest);
+        },
+
+        processPayment: function (paymentData, self) {
+            var paymentToken =
+                paymentData.paymentMethodData.tokenizationData.token;
+            var _self = self;
+            _self.elementox = paymentToken;
+            PagarmeCore.platFormConfig.addresses.billingAddress =
+                quote.billingAddress();
+
+            var PlatformPlaceOrder = {
+                obj: _self,
+                data: paymentToken,
+                event: event,
+            };
+
+            PagarmeCore.placeOrder(PlatformPlaceOrder, this.getModel());
+        },
+
+        getMailingAddress: function () {
+            return window.checkoutConfig.payment.checkmo.mailingAddress;
+        },
+        getInstructions: function () {
+            return window.checkoutConfig.payment.instructions[this.item.method];
+        },
+        getModel: function () {
+            return "googlepay";
+        },
+
+        getData: function () {
+            var paymentMethod = PagarmeCore.paymentMethod[this.getModel()];
+            if (paymentMethod == undefined) {
+                return paymentMethod;
+            }
+            var paymentModel = paymentMethod.model;
+            return paymentModel.getData();
+        },
+    });
+});
diff --git a/view/frontend/web/js/view/payment/payments.js b/view/frontend/web/js/view/payment/payments.js
index ab58ed40..b3fa2df7 100755
--- a/view/frontend/web/js/view/payment/payments.js
+++ b/view/frontend/web/js/view/payment/payments.js
@@ -46,6 +46,10 @@ define(
             {
                 type: "pagarme_billet_creditcard",
                 component: "Pagarme_Pagarme/js/view/payment/boletocreditcard"
+            },
+            {
+                type: 'pagarme_googlepay',
+                component: 'Pagarme_Pagarme/js/view/payment/googlepay'
             }
         );
         return Component.extend({});
diff --git a/view/frontend/web/template/payment/googlepay.html b/view/frontend/web/template/payment/googlepay.html
new file mode 100644
index 00000000..ab6c77b3
--- /dev/null
+++ b/view/frontend/web/template/payment/googlepay.html
@@ -0,0 +1,34 @@
+<div
+    class="payment-method"
+    data-bind="css: {'_active': (getCode() == isChecked())}"
+    >
+    <div class="payment-method-title field choice">
+        <input
+            type="radio"
+            name="payment[method]"
+            class="radio"
+            data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, 
+                    visible: isRadioButtonVisible(), afterRender: addGooglePayButton"
+        />
+        <label data-bind="attr: {'for': getCode()}" class="label">
+            <span data-bind="text: getTitle()"></span>
+        </label>
+    </div>
+    <div class="payment-method-content">
+        <!-- ko foreach: getRegion('messages') -->
+            <!-- ko template: getTemplate() --><!-- /ko -->
+        <!--/ko-->
+        <div class="actions-toolbar">
+            <div class="primary">
+                <div id="pagarme-googlepay"
+                    data-bind="
+                        click: onGooglePaymentButtonClicked
+                        enable: (getCode() == isChecked())"
+                    disabled
+                    style="height: 52px"
+                ></div>
+            </div>
+        </div>
+    </div>
+    <div afterRender="initPaymentMethod()"></div>
+</div>