diff --git a/inter/hkg/image/page_payment/bd_pay_with_credit.png b/inter/hkg/image/page_payment/bd_pay_with_credit.png
new file mode 100644
index 00000000..937118cf
Binary files /dev/null and b/inter/hkg/image/page_payment/bd_pay_with_credit.png differ
diff --git a/inter/hkg/image/page_payment/bn_pay_with_ccard.png b/inter/hkg/image/page_payment/bn_pay_with_ccard.png
new file mode 100644
index 00000000..f9cabe0f
Binary files /dev/null and b/inter/hkg/image/page_payment/bn_pay_with_ccard.png differ
diff --git a/inter/hkg/image/page_payment/bp_pay_with_ccard.png b/inter/hkg/image/page_payment/bp_pay_with_ccard.png
new file mode 100644
index 00000000..ee877e52
Binary files /dev/null and b/inter/hkg/image/page_payment/bp_pay_with_ccard.png differ
diff --git a/inter/hkg/image/page_payment/img_use_qr_code.png b/inter/hkg/image/page_payment/img_use_qr_code.png
new file mode 100644
index 00000000..b02ad7b8
Binary files /dev/null and b/inter/hkg/image/page_payment/img_use_qr_code.png differ
diff --git a/inter/hkg/xml/page_brewing3.lxml b/inter/hkg/xml/page_brewing3.lxml
index acce5f25..c9b246c0 100644
--- a/inter/hkg/xml/page_brewing3.lxml
+++ b/inter/hkg/xml/page_brewing3.lxml
@@ -444,7 +444,7 @@
 		Var XPercent = 0
 	EndIf
 
-	CashlessReq SUCCESS
+	CashlessReq SUCCESS ""
 
 </EventOpen>
 <EventLanguageOnChange>
@@ -989,8 +989,8 @@
 
 					If Seeker.CreditCard = 1 Then
 
-							;CashlessReq SUCCESS
-							;CashlessReq FAIL
+							;CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 
 					EndIf
 
@@ -999,8 +999,8 @@
 
 						If Seeker.CreditCard = 1 Then
 
-							;CashlessReq SUCCESS
-							;CashlessReq FAIL
+							;CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 
 						EndIf
 
@@ -1063,7 +1063,7 @@
 			If Seeker.PayWithQR = 0 Then
 
 				If Seeker.CreditCard = 1 Then
-					;CashlessReq FAIL
+					;CashlessReq FAIL ""
 					Var ChangeFlag = 1
 					Var CreditCardVoid = 1
 				Else
diff --git a/inter/hkg/xml/page_brewing3Conti.xml b/inter/hkg/xml/page_brewing3Conti.xml
index 324524d3..46a3cd2d 100644
--- a/inter/hkg/xml/page_brewing3Conti.xml
+++ b/inter/hkg/xml/page_brewing3Conti.xml
@@ -709,8 +709,8 @@
 
 					If Seeker.CreditCard = 1 Then
 					
-							CashlessReq SUCCESS
-							;CashlessReq FAIL
+							CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 
 					EndIf
 					Var PayDetail2 = Seeker.PayDetail2
@@ -721,8 +721,8 @@
 						If Seeker.CreditCard = 1 Then
 							
 
-							CashlessReq SUCCESS
-							;CashlessReq FAIL
+							CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 							
 						EndIf
 						Var PayDetail2 = Seeker.PayDetail2
@@ -798,7 +798,7 @@
 			If Seeker.PayWithQR = 0 Then 
 
 				If Seeker.CreditCard = 1 Then
-					CashlessReq FAIL
+					CashlessReq FAIL ""
 					Var ChangeFlag = 1 
 					Var CreditCardVoid = 1
 				Else
diff --git a/inter/hkg/xml/page_member_topup.lxml b/inter/hkg/xml/page_member_topup.lxml
index 3de37ec1..36e6e45b 100644
--- a/inter/hkg/xml/page_member_topup.lxml
+++ b/inter/hkg/xml/page_member_topup.lxml
@@ -69,9 +69,9 @@
 
 		If CashlessPayFlag = 1 Then
 			Var CashlessPayFlag = 0 
-			CashlessReq FAIL
+			CashlessReq FAIL ""
 		Else
-			CashlessReq OFF
+			CashlessReq OFF ""
 		EndIf
 
 		Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@@ -90,7 +90,7 @@
 
 <EventActionOk>
 	If VendingCashless = "OK" Then
-		CashlessReq SUCCESS
+		CashlessReq SUCCESS ""
 
 		Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
 		Open ToppupSuccessPage
@@ -108,7 +108,7 @@
 			Var LOADING_STATE = "Invisible"	
 		EndIf
 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 
 	EndIf
 
@@ -277,7 +277,7 @@
 
 	If CashlessPayFlag = 1 Then
 		Var CashlessPayFlag = 0 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 	EndIf
 
 	Var CheckMemberPage2 = CountryRootPath + "xml/page_check_member2.lxml"
@@ -332,11 +332,11 @@
 	Var QRErrorState = "Invisible"
 	Var alphaState = "Invisible"
 
-	CashlessReq OFF
+	CashlessReq OFF ""
 
 	If CashlessPayFlag = 1 Then
 		Var CashlessPayFlag = 0 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 	EndIf
 
 	DEBUGVAR LOADING_STATE
diff --git a/xml/page_payment_cash-HKG.xml b/xml/page_payment_cash-HKG.xml
index 2e9aec32..bb337d0e 100644
--- a/xml/page_payment_cash-HKG.xml
+++ b/xml/page_payment_cash-HKG.xml
@@ -1022,7 +1022,7 @@
 				Var cancelState = "Enable"
 
 				If CashlessPayFlag = 1 Then
-                    CashlessReq VENDINGCANCEL
+                    CashlessReq VENDINGCANCEL ""
                     SAVELOG "Cashless called VENDINGCANCEL"
                 EndIf
 
@@ -1597,7 +1597,7 @@
 			Var CancelCounter = 0
 
 			If CashlessPayFlag = 1 Then
-                CashlessReq VENDINGCANCEL
+                CashlessReq VENDINGCANCEL ""
                 SAVELOG "Cashless called VENDINGCANCEL"
             EndIf
 
@@ -1676,9 +1676,9 @@
 <X> X_CASH </X>
 <Y> TopRowY </Y>
 <State> CreditCardButtonState </State>
-<Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card_ezlink.png") </Filename>
-<FilenamePress> Var( CountryRootPath + "/image/page_payment/bd_credit_card_ezlink.png") </FilenamePress>
-<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_credit_card_ezlink.png") </FilenameDisable>
+<Filename> Var( CountryRootPath + "/image/page_payment/bn_pay_with_ccard.png") </Filename>
+<FilenamePress> Var( CountryRootPath + "/image/page_payment/bd_pay_with_ccard.png") </FilenamePress>
+<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_pay_with_ccard.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -1703,7 +1703,7 @@ If alphaState = "Invisible" Then
                 EndIf
             Else
                 If UserChoosePayment = "QRCode" Then
-                    CashlessReq VENDINGCANCEL
+                    CashlessReq VENDINGCANCEL ""
                     Var LOADING_STATE = "Enable"
                     Var SwitchingQRCodeToCreditCard = 1
                     Var SwitchingContDown = 1
@@ -1727,9 +1727,9 @@ EndIf
 <X> 439 </X>
 <Y> TopRowY </Y>
 <State> QRCodeButtonState </State>
-<Filename> Var( DirImage + "/bn_prompt_pay.png") </Filename>
-<FilenamePress> Var( DirImage + "/bp_prompt_pay.png") </FilenamePress>
-<FilenameDisable> Var( DirImage + "/bd_prompt_pay.png") </FilenameDisable>
+<Filename> Var( CountryRootPath + "/image/page_payment/bn_pay_with_qr_code.png") </Filename>
+<FilenamePress> Var( CountryRootPath + "/image/page_payment/bp_pay_with_qr_code.png") </FilenamePress>
+<FilenameDisable> Var( CountryRootPath + "/image/page_payment/bd_pay_with_qr_code.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -1742,12 +1742,12 @@ If alphaState = "Invisible" Then
 			DEBUGVAR UserChoosePayment
             Var QRCODE99 = ""
             Var QRErrorState = "Invisible"
-            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
+            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_use_qr_code.png"
             Var LOADING_STATE = "Enable"
             Var alphaState = "Enable"
 
             If UserChoosePayment = "CreditCard" Then
-                CashlessReq VENDINGCANCEL
+                CashlessReq VENDINGCANCEL ""
                 Var SwitchingCreditCardToQRCode = 1
                 Var SwitchingContDown = 1
             Else
@@ -1835,7 +1835,7 @@ eval(
 			Var CancelCounter = 0
 
             If CashlessPayFlag = 1 Then
-                CashlessReq VENDINGCANCEL
+                CashlessReq VENDINGCANCEL ""
                 SAVELOG "Cashless called VENDINGCANCEL"
             EndIf
 
@@ -1938,7 +1938,7 @@ eval(
     SAVELOG "Button cancel popup pressed."
 
     If CashlessPayFlag = 1 Then
-        CashlessReq VENDINGCANCEL
+        CashlessReq VENDINGCANCEL ""
         Var LOADING_STATE = "Enable"
         Var CashlessClosingPopup = 1
         Var CashlessClosingPopupCountDown = 1
@@ -2042,18 +2042,18 @@ eval(
 			If CashlessPayFlag = 0 Then
 				If UserChoosePayment = "CreditCard" Then
 					Var CashlessPayFlag = 0
-					CashlessReq FAIL
+					CashlessReq FAIL ""
 				EndIf
 
 				If UserChoosePayment = "" Then
 					Var CashlessPayFlag = 0
-					CashlessReq FAIL
+					CashlessReq FAIL ""
 				EndIf
 			EndIf
 
 			If CashlessPayFlag = 1 Then
 				Var CashlessPayFlag = 0
-				CashlessReq FAIL
+				CashlessReq FAIL ""
 			EndIf
 
         EndIf
@@ -2111,18 +2111,18 @@ eval(
 			If CashlessPayFlag = 0 Then
 				If UserChoosePayment = "CreditCard" Then
 					Var CashlessPayFlag = 0
-					CashlessReq FAIL
+					CashlessReq FAIL ""
 				EndIf
 
 				If UserChoosePayment = "" Then
 					Var CashlessPayFlag = 0
-					CashlessReq FAIL
+					CashlessReq FAIL ""
 				EndIf
 			EndIf
 
 			If CashlessPayFlag = 1 Then
 				Var CashlessPayFlag = 0
-				CashlessReq FAIL
+				CashlessReq FAIL ""
 			EndIf
 
         EndIf
@@ -2165,18 +2165,18 @@ eval(
 			If CashlessPayFlag = 0 Then
 				If UserChoosePayment = "CreditCard" Then
 					Var CashlessPayFlag = 0
-					CashlessReq FAIL
+					CashlessReq FAIL ""
 				EndIf
 
 				If UserChoosePayment = "" Then
 					Var CashlessPayFlag = 0
-					CashlessReq FAIL
+					CashlessReq FAIL ""
 				EndIf
 			EndIf
 
 			If CashlessPayFlag = 1 Then
 				Var CashlessPayFlag = 0
-				CashlessReq FAIL
+				CashlessReq FAIL ""
 			EndIf
 
 
@@ -2291,19 +2291,19 @@ eval(
 					If CashlessPayFlag = 0 Then
 						If UserChoosePayment = "CreditCard" Then
 							Var CashlessPayFlag = 0
-							CashlessReq FAIL
+							CashlessReq FAIL ""
 						EndIf
 
 						If UserChoosePayment = "" Then
 							Var CashlessPayFlag = 0
-							CashlessReq FAIL
+							CashlessReq FAIL ""
 						EndIf
 					EndIf
 
 
 					If CashlessPayFlag = 1 Then
 						Var CashlessPayFlag = 0
-						CashlessReq FAIL
+						CashlessReq FAIL ""
 					EndIf
 
 					DEBUGVAR UserChoosePayment
@@ -2378,18 +2378,18 @@ eval(
 					If CashlessPayFlag = 0 Then
 						If UserChoosePayment = "CreditCard" Then
 							Var CashlessPayFlag = 0
-							CashlessReq FAIL
+							CashlessReq FAIL ""
 						EndIf
 
 						If UserChoosePayment = "" Then
 							Var CashlessPayFlag = 0
-							CashlessReq FAIL
+							CashlessReq FAIL ""
 						EndIf
 					EndIf
 
 					If CashlessPayFlag = 1 Then
 						Var CashlessPayFlag = 0
-						CashlessReq FAIL
+						CashlessReq FAIL ""
 					EndIf
 
 					DEBUGVAR UserChoosePayment