diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index bbfe61e..8b9a396 100644
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -13,7 +13,7 @@
         <section id="payment">
             <group id="tpaycom_magento2basic" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>tpay.com</label>
-                <comment><![CDATA[<a href="https://tpay.com/" target="_blank">Jeśli nie masz jeszcze konta, zarejestruj się w  <b> tpay.com </b></a>]]></comment>
+                <comment><![CDATA[If you do not have an account yet, register in the production system at <a href="https://tpay.com/" target="_blank">tpay.com</a> or sandbox system <a href="https://panel.sandbox.tpay.com/" target="_blank">sandbox.tpay.com</a>]]></comment>
                 <field id="active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Active</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -27,10 +27,12 @@
                     </field>
                     <field id="merchant_id" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Merchant ID</label>
+                        <comment>Your login for Merchant’s panel</comment>
                         <validate>validate-number validate-length maximum-length-10</validate>
                     </field>
                     <field id="security_code" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Secure code</label>
+                        <label>Security code</label>
+                        <comment>Find in Merchant’s panel: Settings -> Notifications</comment>
                         <validate>validate-length maximum-length-32</validate>
                     </field>
                     <field id="show_payment_channels_online" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -47,91 +49,104 @@
                     </field>
                     <field id="use_sandbox" translate="label" type="select" sortOrder="11" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Use sandbox mode (avoid using it in real production store)</label>
+                        <comment>Avoid using it in real production store</comment>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
                 </group>
                 <group id="openapi_settings" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Open Api</label>
+                    <label>Standard payments (Open API)</label>
                     <field id="open_api_active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Active</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
                     <field id="open_api_client_id" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Client ID OPEN API</label>
+                        <label>Client ID</label>
+                        <comment>Find in Merchant’s panel: Integration -> API -> Open API Keys</comment>
                         <validate>validate-length maximum-length-64</validate>
                         <depends><field id="open_api_active">1</field></depends>
                     </field>
                     <field id="open_api_password" translate="label comment" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>API password OPEN API</label>
+                        <label>Secret</label>
+                        <comment>Find in Merchant’s panel: Integration -> API -> Open API Keys</comment>
                         <validate>validate-length maximum-length-64</validate>
                         <depends><field id="open_api_active">1</field></depends>
                     </field>
                     <field id="onsite_channels" translate="label" type="multiselect" sortOrder="18" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Generic onsites</label>
+                        <label>Signalize payment</label>
+                        <comment>Select the payment methods that you want to be displayed separately</comment>
                         <can_be_empty>1</can_be_empty>
                         <source_model>tpaycom\magento2basic\Model\Config\Source\OnsiteChannels</source_model>
                         <depends><field id="open_api_active">1</field></depends>
                     </field>
                 </group>
                 <group id="originapi_settings" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Origin Api</label>
+                    <label>Configuration Origin API</label>
                     <field id="origin_api_active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Active</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
                     <field id="api_key_tpay" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>API key</label>
+                        <label>Key</label>
+                        <comment>Find in Merchant’s panel: Integration -> API -> Old API Keys</comment>
                         <validate>no-whitespace validate-length maximum-length-126</validate>
                         <depends><field id="origin_api_active">1</field></depends>
                     </field>
                     <field id="api_password" translate="label comment" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>API password</label>
+                        <label>Password</label>
+                        <comment>Find in Merchant’s panel: Integration -> API -> Old API Keys</comment>
                         <validate>no-whitespace validate-length maximum-length-40</validate>
                         <depends><field id="origin_api_active">1</field></depends>
                     </field>
                 </group>
+
                 <group id="cardpayment_settings" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Card payment settings</label>
+                    <label>Cards payments On-site settings</label>
                     <field id="cardpayment_api_active" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Active</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
                     <group id="cardpayment_originapi_settings"  translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Origin Api card payment settings</label>
+                        <label>Cards payments Origin API settings </label>
                         <depends><field id="cardpayment_api_active">1</field></depends>
                         <field id="hash_type" translate="label" type="select" sortOrder="7" showInDefault="1" showInWebsite="1" showInStore="1">
-                            <label>Hash type</label>
+                            <label>Digest algorithm</label>
+                            <comment>Find in Merchant’s panel: Credit cards payment -> API</comment>
                             <source_model>tpaycom\magento2basic\Model\Config\Source\HashTypes</source_model>
                         </field>
                         <field id="verification_code" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Verification code</label>
+                            <comment>Find in Merchant’s panel: Credit cards payment -> API</comment>
                         </field>
                         <field id="card_api_key_tpay" translate="label comment" type="text" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Card API key</label>
+                            <comment>Find in Merchant’s panel: Credit cards payment -> API</comment>
                             <validate>no-whitespace validate-length maximum-length-126</validate>
                         </field>
                         <field id="card_api_password" translate="label comment" type="text" sortOrder="6" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Card API password</label>
+                            <comment>Find in Merchant’s panel: Credit cards payment -> API</comment>
                             <validate>no-whitespace validate-length maximum-length-40</validate>
                         </field>
                     </group>
                     <field id="card_title" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Card description</label>
+                        <label>Description</label>
                         <validate>validate-no-empty</validate>
                         <depends><field id="cardpayment_api_active">1</field></depends>
                     </field>
                     <field id="rsa_key" translate="label" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>RSA key</label>
+                        <comment>Find in Merchant’s panel: Credit cards payment -> API</comment>
                         <depends><field id="cardpayment_api_active">1</field></depends>
                     </field>
                     <field id="card_save_enabled" translate="label" type="select" sortOrder="8" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Enable credit card saving</label>
+                        <comment>Only available for logged in users</comment>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <depends><field id="cardpayment_api_active">1</field></depends>
                     </field>
                 </group>
                 <group id="sale_settings" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Sale settings</label>
+                    <label>Additional settings</label>
                     <field id="send_invoice_email" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Send new invoice email to customer</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
@@ -149,7 +164,8 @@
                         <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                     </field>
                     <field id="min_order_total" translate="label" type="text" sortOrder="16" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Minimal amount for method</label>
+                        <label>Minimal amount</label>
+                        <comment>Leave empty for no limit</comment>
                         <validate>validate-number</validate>
                     </field>
                     <field id="max_order_total" translate="label" type="text" sortOrder="17" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/i18n/pl_PL.csv b/i18n/pl_PL.csv
index f894662..efd869c 100644
--- a/i18n/pl_PL.csv
+++ b/i18n/pl_PL.csv
@@ -3,19 +3,32 @@
 "Active","Aktywny"
 "Description","Opis"
 "Merchant ID","ID Sprzedawcy"
-"Secure code","Kod bezpieczeństwa"
+"Security code","Kod bezpieczeństwa"
 "Show payment channels on front","Pokaż kanały płatności na stronie"
-"Only online methods","Dostępne tylko płatności online"
-"Redirect directly to bank","Przekieruj bezpośrednio do banku"
+"Only online methods","Tylko metody płatności księgujące online"
+"Redirect directly to bank","Bezpośrednie przekierowanie do banku"
 "API key","API Klucz"
 "API password","API Hasło"
+"BLIK level zero","BLIK poziom zero"
+"Sandbox mode","Tryb Sandbox"
+"Client ID","Client ID"
+"Secret","Secret"
+"Signalize payment","Wyróżnij płatność"
+"Key","Klucz"
+"Password","Hasło"
+"RSA key","Klucz RSA"
+"Enable credit card saving","Włącz zapisywanie karty"
+"Verification code","Kod weryfikacyjny"
+"Card API key","Klucz API"
+"Card API password","Hasło API"
+"Digest algorithm","Algorytm podpisu"
 "Necessary for BLIK level zero payments","Wymagane przy włączonej opcji BLIK level zero"
-"Sort order","Pozycja na liście"
-"All or allowed countries","Dostępność z ograniczeniem państw"
-"Allowed countries","Dostępność dla wybranych krajów"
-"Minimal amount for method","Dostępność od minimalnej kwoty zamówienia"
-"Maximal amount for method","Dostępność do maksymalnej kwoty zamówienia"
-"Leave empty for no limit","Pozostaw puste, jeśli nie ma limitu"
+"Sort order","Pozycja płatności"
+"All or allowed countries","Wyszstkie czy dozwolone kraje"
+"Allowed countries","Dozwolone kraje"
+"Minimal amount","Minimalna kwota"
+"Maximal amount for method","Maksymalna kwota"
+"Leave empty for no limit","Puste pole bez ograniczeń"
 "Type in 6 digit code and press pay to commit blik payment.", "Wpisz 6 cyfrowy kod aby powiązać transakcję blik."
 "Choose a payment method","Wybierz jeden ze sposobów płatności"
 "I accept the regulations of Tpay.","Akceptuje regulamin Tpay."
@@ -27,4 +40,19 @@
 "Choose a payment method","Wybierz metodę płatności"
 "Transaction has been refunded","Transakcja została zwrócona"
 "The order has been holded","Zamówienie zostało wstrzymane"
-"Send new invoice email to customer", "Wyślij fakturę na adres email klienta"
+"Send new invoice email to customer", "Wyślij wiadomość e-mail z fakturą do klienta"
+"If you do not have an account yet, register in the production system at tpay.com or sandbox system panel.sandbox.tpay.com","Jeśli nie masz jeszcze konta, zarejestruj się w systemie produkcyjnym na tpay.com lub w systemie sandbox tpay.com"
+"Your login for Merchant’s panel","Twój login do Panelu Akceptanta"
+"Find in Merchant’s panel: Settings -> Notifications","Znajdziesz w Panelu Akceptanta: Ustawienia -> Powiadomienia"
+"Avoid using it in real production store","Unikaj używania go w prawdziwym sklepie produkcyjnym"
+"Find in Merchant’s panel: Integration -> API -> Open API Keys","Znajdziesz w Panelu Akceptanta: Integracje -> API -> Klucze do nowego Open API"
+"Select the payment methods that you want to be displayed separately","Zaznacz metody płatności, które chcesz by wyświetlały sie jako osobne"
+"Find in Merchant’s panel: Integration -> API -> Old API Keys","Znajdziesz w Panelu Akceptanta: Integracje -> API -> Klucze do starego API"
+"Find in Merchant’s panel: Credit cards payment -> API","Znajdziesz w Panelu Akceptanta: Płatności kartami -> API"
+"Only available for logged in users","Możliwe tylko dla zalogowanych użytkowników"
+"General settings","Ustawienia główne"
+"Standard payments (Open API)","Płatności standardowe (Open API)"
+"Configuration Origin API","Konfiguracja Origin API"
+"Cards payments On-site settings","Konfiguracja kart płatniczych On-site"
+"Cards payments Origin API settings","Konfiguracja kart płatniczych Origin API"
+"Additional settings","Dodatkowe ustawienia"