diff --git a/cardgate/cardgate.php b/cardgate/cardgate.php
index feba478..05651c6 100755
--- a/cardgate/cardgate.php
+++ b/cardgate/cardgate.php
@@ -6,12 +6,12 @@
  * Description: Integrates Cardgate Gateway for WooCommerce into WordPress
  * Author: CardGate
  * Author URI: https://www.cardgate.com
- * Version: 3.1.25
+ * Version: 3.1.26
  * Text Domain: cardgate
  * Domain Path: /i18n/languages
  * Requires at least: 4.4
  * WC requires at least: 3.0.0
- * WC tested up to: 7.8.0
+ * WC tested up to: 8.1.1
  * License: GPLv3 or later
  */
 
@@ -22,6 +22,7 @@ class cardgate {
     protected $_Lang = NULL;
     protected $current_gateway_title = '';
     protected $current_gateway_extra_charges = '';
+	protected $current_gateway_extra_charges_type_value = '';
     protected $plugin_url;
     /**
      * Initialize plug-in
diff --git a/cardgate/classes/CGP_Common_Gateway.php b/cardgate/classes/CGP_Common_Gateway.php
index c8d1768..18a7cef 100755
--- a/cardgate/classes/CGP_Common_Gateway.php
+++ b/cardgate/classes/CGP_Common_Gateway.php
@@ -491,13 +491,13 @@ private function savePaymentData( $iOrderId, $sParent_ID = false ) {
 			'gateway_language' => $this->getLanguage(),
 			'payment_method'   => $this->payment_method,
 			'bank_option'      => $this->bankOption,
-			'first_name'       => $order->billing_first_name,
-			'last_name'        => $order->billing_last_name,
-			'address'          => $order->billing_address_1,
-			'postal_code'      => $order->billing_postcode,
-			'city'             => $order->billing_city,
-			'country'          => $order->billing_country,
-			'email'            => $order->billing_email,
+			'first_name'       => $order->get_billing_first_name(),
+			'last_name'        => $order->get_billing_last_name(),
+			'address'          => $order->get_billing_address_1(),
+			'postal_code'      => $order->get_billing_postcode(),
+			'city'             => $order->get_billing_city(),
+			'country'          => $order->get_billing_country(),
+			'email'            => $order->get_billing_email(),
 			'status'           => 'pending',
 			'date_gmt'         => date( 'Y-m-d H:i:s' )
 		];
diff --git a/cardgate/i18n/languages/cardgate.pot b/cardgate/i18n/languages/cardgate.pot
new file mode 100644
index 0000000..a5813f7
--- /dev/null
+++ b/cardgate/i18n/languages/cardgate.pot
@@ -0,0 +1,226 @@
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: CardGate\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-02-25 14:18+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: \n"
+"Language: \n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Loco https://localise.biz/\n"
+"X-Loco-Version: 2.2.0; wp-4.2.15"
+
+#: classes/CGP_Common_Gateway.php:556
+msgid " Choose your bank first, please"
+msgstr ""
+
+#: cardgate.php:715
+msgid "Add Extra Fees"
+msgstr ""
+
+#: cardgate.php:733
+msgid "Add Fee to Total"
+msgstr ""
+
+#: classes/Cardgate_PaymentsListTable.php:124
+msgid "Amount"
+msgstr ""
+
+#: cardgate.php:274
+msgid "API key"
+msgstr ""
+
+#: classes/CGP_Common_Gateway.php:46
+msgid "Bank Option"
+msgstr ""
+
+#. Name of the plugin
+#. Author of the plugin
+msgid "CardGate"
+msgstr ""
+
+#: cardgate.php:328
+msgid "CardGate Payments"
+msgstr ""
+
+#: cardgate.php:232
+msgid "CardGate Settings"
+msgstr ""
+
+#: cardgate.php:281
+msgid "Checkout display"
+msgstr ""
+
+#: cardgate.php:567
+msgid "Content"
+msgstr ""
+
+#: classes/Cardgate_PaymentsListTable.php:123
+msgid "Customer Name"
+msgstr ""
+
+#: classes/Cardgate_PaymentsListTable.php:120
+msgid "Date"
+msgstr ""
+
+#: classes/CGP_Common_Gateway.php:112
+msgid "Description"
+msgstr ""
+
+#: classes/CGP_Common_Gateway.php:99
+msgid "Enable/Disable"
+msgstr ""
+
+#: cardgate.php:717
+msgid "Extra Fee"
+msgstr ""
+
+#: cardgate.php:730
+msgid "Fee type"
+msgstr ""
+
+#: cardgate.php:260
+msgid "Hash key"
+msgstr ""
+
+#. URI of the plugin
+#. Author URI of the plugin
+msgid "http://cardgate.com"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "in your"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "installation instructions"
+msgstr ""
+
+#. Description of the plugin
+msgid "Integrates Cardgate Gateway for WooCommerce into WordPress"
+msgstr ""
+
+#: cardgate.php:724
+msgid "Label for Extra Fee"
+msgstr ""
+
+#: cardgate.php:242
+msgid "Mode"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "My CardGate"
+msgstr ""
+
+#: cardgate.php:727
+msgid "My Custom Label"
+msgstr ""
+
+#: classes/Cardgate_PaymentsListTable.php:111
+msgid "No payments found."
+msgstr ""
+
+#: classes/Cardgate_PaymentsListTable.php:298
+msgid "of"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "of this plugin"
+msgstr ""
+
+#: classes/CGP_Common_Gateway.php:115
+msgid "Pay with "
+msgstr ""
+
+#: classes/CGP_Common_Gateway.php:114
+msgid "Payment method description that the customer will see on your website."
+msgstr ""
+
+#: classes/CGP_Common_Gateway.php:107
+msgid "Payment method title that the customer will see on your checkout."
+msgstr ""
+
+#: classes/Cardgate_PaymentsListTable.php:125
+msgid "Payment Status"
+msgstr ""
+
+#: cardgate.php:362
+msgid "Payments Table"
+msgstr ""
+
+#: cardgate.php:734
+msgid "Percentage of Total"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "README.md"
+msgstr ""
+
+#: cardgate.php:334
+msgid "Search Payments"
+msgstr ""
+
+#: cardgate.php:215
+msgid "See the instructions above. "
+msgstr ""
+
+#: cardgate.php:357
+msgid "Settings"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "Settings button"
+msgstr ""
+
+#: cardgate.php:557
+msgid "Slug"
+msgstr ""
+
+#: cardgate.php:224
+msgid ""
+"The CardGate payment methods will only be visible in the WooCommerce Plugin, "
+"once the Site ID and Hashkey have been filled in."
+msgstr ""
+
+#: cardgate.php:215
+msgid "The settings are not correct for the Mode you chose."
+msgstr ""
+
+#: cardgate.php:295
+msgid ""
+"These settings apply to all CardGate payment methods used in the WooCommerce "
+"plugin."
+msgstr ""
+
+#: cardgate.php:547 classes/CGP_Common_Gateway.php:105
+msgid "Title"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "to set these values, as explained in the"
+msgstr ""
+
+#: classes/Cardgate_PaymentsListTable.php:122
+msgid "Transaction ID"
+msgstr ""
+
+#: cardgate.php:292 cardgate.php:829
+msgid "Use the "
+msgstr ""
+
+#: cardgate.php:286
+msgid "With Logo"
+msgstr ""
+
+#: cardgate.php:285
+msgid "Without Logo"
+msgstr ""
+
+#: cardgate.php:518
+msgid "Your payment has failed. Please choose an other payment method."
+msgstr ""
diff --git a/cardgate/images/cgp_icon-16x16_bw.png b/cardgate/images/cgp_icon-16x16_bw.png
new file mode 100644
index 0000000..94ce300
Binary files /dev/null and b/cardgate/images/cgp_icon-16x16_bw.png differ
diff --git a/cardgate/images/cgp_icon-16x16_color.png b/cardgate/images/cgp_icon-16x16_color.png
new file mode 100644
index 0000000..a8439a8
Binary files /dev/null and b/cardgate/images/cgp_icon-16x16_color.png differ
diff --git a/cardgate/readme.txt b/cardgate/readme.txt
index c2917f1..595f127 100644
--- a/cardgate/readme.txt
+++ b/cardgate/readme.txt
@@ -4,7 +4,7 @@ Contributors: cardgate
 Tags: CardGate, iDEAL, Creditcard, WooCommerce, Payment, MisterCash, SofortBanking, OverBoeking, PayPal, Giropay, DirectDebit, Webmoney
 Requires at least: 4.4
 Tested up to: 6.2
-Stable tag: 3.1.25
+Stable tag: 3.1.26
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -75,6 +75,9 @@ If you are updating from an older version then 3.0.4 you will need new [CardGate
 
 == Changelog ==
 
+= 3.1.26 =
+* Fix: deprecated calls
+
 = 3.1.25 =
 * Fix: deprecated dynamic properties