diff --git a/sdk/build.gradle b/sdk/build.gradle
index 5710939a..c0840b25 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -20,12 +20,6 @@ android {
         compileSdk compile_sdk_version
         buildConfigField "int", "VERSION_CODE", "$omise_sdk_code_version"
         buildConfigField "String", "VERSION_NAME", "\"$omise_sdk_version\""
-        buildConfigField "String", "NETCETERA_API_KEY", "\"${System.getenv('NETCETERA_API_KEY')}\""
-        buildConfigField "String", "SCHEME_NAME", "\"${System.getenv('SCHEME_NAME')}\""
-        buildConfigField "String", "DS_ID", "\"${System.getenv('DS_ID')}\""
-        buildConfigField "String", "MESSAGE_VERSION", "\"${System.getenv('MESSAGE_VERSION')}\""
-        buildConfigField "String", "ACS_REF_NUMBER", "\"${System.getenv('ACS_REF_NUMBER')}\""
-        buildConfigField "String", "DS_PUBLIC_KEY", "\"${System.getenv('DS_PUBLIC_KEY')}\""
         testInstrumentationRunner "co.omise.android.OmiseTestRunner"
     }
 
@@ -173,7 +167,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
     implementation 'com.google.android.gms:play-services-wallet:19.1.0'
     // Required by Netcetera, check https://3dss.netcetera.com/3dssdk/doc/2.10.0/android-error-handling error [1322]
-    implementation 'org.bouncycastle:bcprov-jdk15to18:1.69'
+    implementation 'org.bouncycastle:bcprov-jdk15to18:1.77'
 
     debugImplementation("androidx.fragment:fragment-testing:$fragment_testing_version") {
         exclude group: 'androidx.test', module: 'core'
diff --git a/sdk/libs/classes.jar b/sdk/libs/classes.jar
index 1a23c0f7..f2084d72 100644
Binary files a/sdk/libs/classes.jar and b/sdk/libs/classes.jar differ
diff --git a/sdk/proguard-rules.pro b/sdk/proguard-rules.pro
index 182fa4cd..9322b5f1 100644
--- a/sdk/proguard-rules.pro
+++ b/sdk/proguard-rules.pro
@@ -87,3 +87,7 @@
 # Keep the classes from slf4j
 -keep class org.slf4j.** { *; }
 
+# Keep kotlin.KotlinVersion if present
+-keep class kotlin.KotlinVersion { *; }
+-dontwarn kotlin.KotlinVersion
+
diff --git a/sdk/src/main/assets/support_server_prev.p12 b/sdk/src/main/assets/support_server_prev.p12
deleted file mode 100644
index 4bc59fdd..00000000
Binary files a/sdk/src/main/assets/support_server_prev.p12 and /dev/null differ
diff --git a/sdk/src/main/assets/support_server_prod.p12 b/sdk/src/main/assets/support_server_prod.p12
deleted file mode 100644
index 2b4ee409..00000000
Binary files a/sdk/src/main/assets/support_server_prod.p12 and /dev/null differ
diff --git a/sdk/src/main/jniLibs/arm64-v8a/libef4c.so b/sdk/src/main/jniLibs/arm64-v8a/libeb90.so
similarity index 99%
rename from sdk/src/main/jniLibs/arm64-v8a/libef4c.so
rename to sdk/src/main/jniLibs/arm64-v8a/libeb90.so
index bd284cec..7efd52bc 100644
Binary files a/sdk/src/main/jniLibs/arm64-v8a/libef4c.so and b/sdk/src/main/jniLibs/arm64-v8a/libeb90.so differ
diff --git a/sdk/src/main/jniLibs/armeabi-v7a/libef4c.so b/sdk/src/main/jniLibs/armeabi-v7a/libeb90.so
similarity index 98%
rename from sdk/src/main/jniLibs/armeabi-v7a/libef4c.so
rename to sdk/src/main/jniLibs/armeabi-v7a/libeb90.so
index 08013fbf..5c947347 100644
Binary files a/sdk/src/main/jniLibs/armeabi-v7a/libef4c.so and b/sdk/src/main/jniLibs/armeabi-v7a/libeb90.so differ
diff --git a/sdk/src/main/jniLibs/x86/libef4c.so b/sdk/src/main/jniLibs/x86/libeb90.so
similarity index 99%
rename from sdk/src/main/jniLibs/x86/libef4c.so
rename to sdk/src/main/jniLibs/x86/libeb90.so
index 189df32d..36394996 100644
Binary files a/sdk/src/main/jniLibs/x86/libef4c.so and b/sdk/src/main/jniLibs/x86/libeb90.so differ
diff --git a/sdk/src/main/jniLibs/x86_64/libef4c.so b/sdk/src/main/jniLibs/x86_64/libeb90.so
similarity index 99%
rename from sdk/src/main/jniLibs/x86_64/libef4c.so
rename to sdk/src/main/jniLibs/x86_64/libeb90.so
index b4165dec..6543d825 100644
Binary files a/sdk/src/main/jniLibs/x86_64/libef4c.so and b/sdk/src/main/jniLibs/x86_64/libeb90.so differ
diff --git a/sdk/src/main/res/drawable/ds_logo_amex.xml b/sdk/src/main/res/drawable/ds_logo_amex.xml
index 128d0e13..c97daa61 100644
--- a/sdk/src/main/res/drawable/ds_logo_amex.xml
+++ b/sdk/src/main/res/drawable/ds_logo_amex.xml
@@ -1,78 +1,42 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="111dp"
-    android:height="28dp"
-    android:viewportWidth="11840"
-    android:viewportHeight="3000">
+    android:width="316.4dp"
+    android:height="108dp"
+    android:viewportWidth="316.4"
+    android:viewportHeight="108">
   <path
-      android:pathData="M4474,2260c-90,-13 -140,-28 -219,-67 -89,-46 -200,-154 -243,-239l-30,-60 96,-51 97,-51 44,65c52,76 126,135 207,166 75,27 254,30 322,4 91,-35 141,-97 142,-176 0,-105 -86,-176 -292,-240 -364,-114 -458,-167 -527,-296 -24,-45 -26,-60 -26,-160 0,-104 2,-114 32,-176 57,-115 171,-198 311,-228 75,-16 255,-13 331,4 132,32 258,117 333,227 46,69 50,61 -60,136l-73,50 -77,-77c-103,-104 -153,-125 -307,-125 -98,-1 -115,2 -160,24 -71,36 -98,79 -93,152 5,67 36,114 101,152 23,14 138,57 255,95 116,38 239,84 273,102 85,45 152,112 186,184 25,53 28,71 28,160 0,87 -4,107 -27,158 -35,74 -113,156 -188,196 -111,59 -300,90 -436,71z"
-      android:fillColor="#474c55"
-      android:strokeColor="#00000000"/>
+      android:pathData="M112.31,63.43l4.75,-2.49c2.11,4.17 5.37,6.19 9.78,6.19c4.32,0 7.24,-1.39 7.24,-4.6c0,-3.07 -2.21,-4.51 -8.06,-6.24c-6.86,-2.01 -12.38,-3.89 -12.38,-10.65c0,-6.04 4.94,-10.03 12.14,-10.03c7,0 11.13,3.45 13.29,7.63l-4.36,3.02c-2.11,-3.55 -5.13,-5.18 -8.97,-5.18c-3.93,0 -6.19,1.44 -6.19,4.03c0,3.31 2.54,4.41 8.35,6.14c6.71,1.97 12.09,4.17 12.09,10.84c0,5.8 -4.94,10.36 -13.38,10.36C119.56,72.45 114.57,68.8 112.31,63.43z"
+      android:fillColor="#474C55"/>
   <path
-      android:pathData="M7456,2244c-166,-40 -288,-160 -340,-334 -26,-83 -31,-249 -12,-339 60,-283 302,-450 581,-402 230,40 351,209 371,516l7,105 -367,0 -368,0 7,33c26,128 87,202 191,233 109,31 258,0 341,-71 23,-19 45,-35 50,-35 5,0 35,27 68,61l60,60 -50,45c-134,119 -357,172 -539,128zM7830,1581c0,-38 -24,-103 -52,-141 -12,-17 -46,-42 -75,-56 -45,-23 -63,-26 -126,-22 -61,3 -83,9 -122,33 -55,34 -100,105 -111,173l-7,42 247,0 246,0 0,-29z"
-      android:fillColor="#474c55"
-      android:strokeColor="#00000000"/>
+      android:pathData="M142.73,65.64c0,-5.52 4.7,-9.21 16.6,-10.55v-0.77c0,-2.54 -1.34,-3.64 -4.17,-3.64c-3.55,0 -6.43,1.73 -8.59,3.45l-2.88,-3.69c2.74,-2.49 7,-4.6 12.28,-4.6c6.81,0 9.16,3.26 9.16,9.21v10.51c0,3.07 0.19,4.94 0.72,6.24h-5.95c-0.34,-1.05 -0.58,-1.82 -0.58,-3.26c-2.59,2.64 -5.61,3.65 -9.4,3.65C145.8,72.16 142.73,69.86 142.73,65.64zM159.33,64.68v-5.61c-7.05,0.96 -10.79,2.69 -10.79,5.47c0,2.01 1.39,3.07 3.55,3.07C155.11,67.6 157.46,66.45 159.33,64.68z"
+      android:fillColor="#474C55"/>
   <path
-      android:pathData="M5425,2238c-55,-20 -109,-63 -140,-112 -28,-46 -30,-57 -30,-140 0,-79 4,-98 28,-148 68,-138 269,-237 566,-279l93,-13 -4,-53c-5,-62 -39,-105 -96,-124 -45,-15 -172,-6 -232,15 -42,16 -142,70 -186,101 -20,15 -24,12 -79,-60l-57,-75 23,-20c141,-119 383,-188 573,-162 155,20 233,81 279,217 5,16 13,201 18,410 4,209 10,395 14,413l7,32 -120,0 -120,0 -11,-44c-6,-25 -11,-54 -11,-65 0,-28 -6,-26 -47,9 -44,39 -119,77 -190,95 -66,17 -233,19 -278,3zM5790,2040c30,-12 76,-37 102,-57l48,-35 0,-120 0,-120 -52,7c-88,12 -232,52 -285,78 -27,14 -65,42 -83,63 -30,34 -32,42 -28,91 5,60 32,97 82,113 46,14 154,4 216,-20z"
-      android:fillColor="#474c55"
-      android:strokeColor="#00000000"/>
+      android:pathData="M173.34,71.77V51.01h-4.41v-4.7h4.41v-2.59c0,-4.27 1.78,-7.58 8.25,-7.58c1.1,0 3.07,0.19 3.5,0.24v4.56c-0.38,-0.1 -1.34,-0.19 -2.01,-0.19c-2.11,0 -3.84,0.58 -3.84,3.31v2.25h5.56v4.7h-5.56v20.77H173.34z"
+      android:fillColor="#474C55"/>
   <path
-      android:pathData="M6528,1808l-3,-433 -92,-3 -93,-3 0,-94 0,-94 93,-3 92,-3 5,-115c4,-91 10,-123 27,-155 52,-98 130,-137 290,-143 61,-2 123,-2 137,2 25,6 26,8 26,95l0,89 -91,4c-88,3 -92,4 -120,36 -27,30 -29,38 -29,112l0,80 115,0 115,0 0,95 0,95 -115,0 -115,0 0,435 0,435 -120,0 -120,0 -2,-432z"
-      android:fillColor="#474c55"
-      android:strokeColor="#00000000"/>
+      android:pathData="M186.92,59.06c0,-9.69 6.86,-13.24 12.14,-13.24c5.71,0 11.18,3.41 11.18,13.77v1.39h-17.41c0.24,4.6 3.07,6.62 6.81,6.62c3.31,0 5.23,-1.1 7.15,-2.97l3.12,3.07c-2.64,2.93 -6.14,4.6 -10.7,4.6C192.82,72.3 186.92,68.42 186.92,59.06zM204.81,56.57c-0.34,-3.89 -2.25,-5.95 -5.8,-5.95c-2.88,0 -5.52,1.63 -6.09,5.95H204.81z"
+      android:fillColor="#474C55"/>
   <path
-      android:pathData="M10,1500l0,-1490 1495,0 1495,0 2,972c2,535 2,1206 0,1491l-2,517 -1495,0 -1495,0 0,-1490z"
-      android:fillColor="#006fcf"
-      android:strokeColor="#00000000"/>
+      android:pathData="M215.51,71.77v-35.5h4.22V54.6l16.07,-18.32h5.08l-12.18,13.53l13.86,21.97h-4.85l-11.8,-18.75l-6.19,6.76v11.99H215.51z"
+      android:fillColor="#878A8F"/>
   <path
-      android:pathData="M10497,2633c-38,-6 -41,-20 -22,-86l16,-56 103,6c93,5 108,4 149,-16 54,-26 88,-72 122,-166l26,-70 -194,-506c-107,-278 -198,-515 -201,-527 -7,-21 -5,-22 81,-22l89,0 154,425c84,233 156,423 158,420 3,-2 73,-192 156,-422l151,-418 83,-3c49,-2 82,1 82,7 0,19 -453,1187 -485,1251 -43,86 -115,153 -186,174 -50,15 -208,20 -282,9z"
-      android:fillColor="#878a8f"
-      android:strokeColor="#00000000"/>
+      android:pathData="M243.77,59.11c0,-9.21 6.14,-13.19 11.46,-13.19c6,0 10.55,4.22 10.55,13.38v0.86H247.9c0.14,5.71 3.45,8.78 7.63,8.78c3.64,0 5.71,-1.49 7.63,-4.12l2.4,2.11c-2.35,3.36 -5.56,5.37 -10.31,5.37C249.24,72.3 243.77,67.94 243.77,59.11zM261.86,56.95c-0.34,-4.51 -2.49,-7.58 -6.67,-7.58c-3.41,0 -6.62,2.35 -7.2,7.58H261.86z"
+      android:fillColor="#878A8F"/>
   <path
-      android:pathData="M9815,2247c-236,-62 -368,-279 -352,-578 6,-125 34,-216 92,-303 47,-71 101,-116 191,-158 66,-32 74,-33 189,-33 114,0 123,2 187,32 36,17 85,51 109,75 82,83 138,245 139,396l0,72 -371,0 -372,0 6,58c8,91 43,169 101,228 62,62 128,87 225,86 101,-1 173,-32 247,-106l62,-62 48,42 48,42 -42,50c-51,61 -132,116 -210,143 -73,26 -227,34 -297,16zM10210,1601c0,-62 -39,-158 -85,-209 -56,-62 -108,-84 -198,-84 -116,0 -205,58 -257,169 -23,50 -43,130 -35,144 4,5 125,9 291,9l284,0 0,-29z"
-      android:fillColor="#878a8f"
-      android:strokeColor="#00000000"/>
+      android:pathData="M267.67,80.89l0.96,-3.31c0.72,0.19 1.97,0.43 3.74,0.43c2.59,0 3.84,-1.1 4.84,-3.6l0.96,-2.49l-9.78,-25.47h4.36l7.43,20.48h0.1l7.44,-20.48h4.17l-10.84,28.21c-1.73,4.46 -3.69,6.86 -8.63,6.86C270.16,81.51 268.77,81.22 267.67,80.89z"
+      android:fillColor="#878A8F"/>
   <path
-      android:pathData="M8280,1500l0,-740 85,0 85,0 0,382 0,381 23,-21c13,-12 165,-184 338,-382l314,-359 104,-1 105,0 -25,27c-135,147 -479,532 -479,536 0,3 128,208 285,456 157,249 285,454 285,457 0,2 -44,4 -97,4l-98,0 -245,-390c-135,-215 -247,-389 -251,-388 -3,2 -62,65 -132,141l-127,138 0,250 0,249 -85,0 -85,0 0,-740z"
-      android:fillColor="#878a8f"
-      android:strokeColor="#00000000"/>
+      android:pathData="M88.82,89.93l-35.53,0l-36.28,0l0,-34.27l0,-37.54l35.69,0l36.12,0l0,37.65l0,34.16z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M11600,1472c-40,-21 -80,-90 -80,-137 1,-54 34,-112 79,-134 110,-57 231,11 231,129 0,120 -124,197 -230,142zM11767,1427c33,-32 44,-85 28,-131 -18,-51 -41,-74 -86,-86 -87,-24 -165,42 -156,133 10,109 139,160 214,84z"
-      android:fillColor="#878a8f"
-      android:strokeColor="#00000000"/>
+      android:pathData="M86.04,69.72H61.86l-1.33,-1.73v1.73h-5.55v-3.27c-0.77,0.31 -1.66,0.48 -2.63,0.48h-0.3v2.79h-7.87l-1.24,-1.74l-1.21,1.74H29.05v-12.5h12.74l1.22,1.7l1.22,-1.7h44.59v-39.1H17.01v28.11l2.46,-5.74h5.11l1.14,2.63V40.5h6.32l0.8,2.27l0.79,-2.27h27.18v1.01c1.02,-0.69 2.29,-1.01 3.64,-1.01h8.41l1.14,2.63V40.5h5.16l1.2,1.95V40.5h5.61V53h-5.3l-1.12,-1.84V53h-7.75l-0.72,-1.84h-1.51L68.88,53h-4.56c-1.12,0 -2.42,-0.21 -3.51,-0.92V53h-7.78l-1.33,-1.73V53H23.52l-0.72,-1.84H21.3L20.6,53h-3.58v36.94h71.81V68.98C88.06,69.45 87.1,69.72 86.04,69.72L86.04,69.72z"
+      android:fillColor="#006FCF"/>
   <path
-      android:pathData="M11620,1335l0,-85 48,0c26,0 52,4 58,8 21,14 24,44 8,71 -15,25 -15,30 0,59 16,31 16,32 -3,32 -11,0 -27,-14 -40,-35 -11,-19 -25,-35 -31,-35 -5,0 -10,16 -10,35 0,24 -5,35 -15,35 -12,0 -15,-16 -15,-85zM11699,1321c21,-13 5,-41 -24,-41 -18,0 -25,5 -25,18 0,31 21,41 49,23z"
-      android:fillColor="#878a8f"
-      android:strokeColor="#00000000"/>
+      android:pathData="M86.09,65.99h-4.41v1.8h4.34c1.87,0 2.98,-1.14 2.98,-2.74c0,-1.56 -1.01,-2.47 -2.69,-2.47h-1.96c-0.51,0 -0.86,-0.33 -0.86,-0.83c0,-0.48 0.36,-0.8 0.86,-0.8h3.71l0.8,-1.8h-4.43c-1.85,0 -2.98,1.14 -2.98,2.69c0,1.61 1.06,2.51 2.69,2.51h1.96c0.51,0 0.86,0.32 0.86,0.84C86.95,65.67 86.59,65.99 86.09,65.99M78.13,65.99h-4.41v1.8h4.34c1.87,0 2.98,-1.14 2.98,-2.74c0,-1.56 -1.01,-2.47 -2.69,-2.47h-1.96c-0.51,0 -0.86,-0.33 -0.86,-0.83c0,-0.48 0.36,-0.8 0.86,-0.8h3.71l0.8,-1.8h-4.43c-1.85,0 -2.98,1.14 -2.98,2.69c0,1.61 1.06,2.51 2.69,2.51h1.96c0.51,0 0.86,0.32 0.86,0.84C79,65.67 78.64,65.99 78.13,65.99M72.57,60.93v-1.78h-6.88v8.65h6.88v-1.75h-4.84v-1.72h4.73v-1.74h-4.73v-1.65H72.57L72.57,60.93zM61.39,60.95c0.74,0 1.11,0.44 1.11,0.99c0,0.54 -0.37,0.99 -1.11,0.99h-2.45v-1.98H61.39L61.39,60.95zM58.95,64.62h0.96l2.63,3.17h2.54l-2.85,-3.25c1.46,-0.27 2.32,-1.31 2.32,-2.68c0,-1.59 -1.14,-2.72 -2.98,-2.72h-4.67v8.65h2.04V64.62L58.95,64.62zM53.72,62.05c0,0.59 -0.37,1.07 -1.11,1.07H50.1v-2.17h2.51C53.35,60.95 53.72,61.43 53.72,62.05M48.06,59.15v8.65h2.04v-2.87h2.62c1.89,0 3.05,-1.24 3.05,-2.89c0,-1.72 -1.14,-2.89 -2.98,-2.89H48.06L48.06,59.15zM45.11,67.8h2.54l-3.48,-4.36l3.46,-4.29h-2.47l-2.15,2.8l-2.14,-2.8h-2.54l3.47,4.32l-3.46,4.32h2.47l2.15,-2.83L45.11,67.8L45.11,67.8zM37.95,60.93v-1.78h-6.88v8.65h6.88v-1.75h-4.84v-1.72h4.73v-1.74h-4.73v-1.65H37.95L37.95,60.93z"
+      android:fillColor="#006FCF"/>
   <path
-      android:pathData="M510,1895l0,-255 268,0 267,0 20,30c11,16 23,30 27,30 4,0 16,-13 28,-30l21,-30 930,0 929,0 0,35 0,35 -94,0c-51,0 -107,3 -125,6 -69,14 -109,95 -77,160 20,42 49,54 130,54 64,0 86,11 86,41 0,24 -20,29 -126,29l-95,0 3,38 3,37 90,3c101,4 155,-8 185,-40l20,-22 0,56c0,54 -1,56 -31,67 -22,7 -203,11 -564,11l-532,0 -26,-37 -27,-38 0,38 0,37 -115,0 -115,0 0,-66c0,-57 -2,-65 -17,-60 -10,2 -37,8 -60,11l-43,7 0,54 0,54 -162,0 -163,0 -27,-32 -28,-33 -27,33 -28,32 -262,0 -263,0 0,-255zM880,2040l0,-40 -100,0 -100,0 0,-35 0,-35 100,0 100,0 0,-35 0,-35 -100,0 -100,0 0,-35 0,-35 100,0 100,0 0,-40 0,-40 -145,0 -145,0 0,178c0,98 3,182 7,185 3,4 69,7 145,7l138,0 0,-40zM1041,2025c23,-30 45,-55 49,-55 4,0 26,25 49,55 41,54 43,55 91,55 28,0 50,-3 50,-7 0,-5 -30,-46 -67,-92 -76,-95 -77,-80 14,-192 29,-36 53,-69 53,-73 0,-3 -22,-6 -49,-6 -47,0 -50,2 -90,55 -23,30 -45,55 -50,55 -4,0 -25,-25 -47,-55 -39,-54 -39,-55 -91,-55 -29,0 -53,3 -53,6 0,3 28,40 62,82 34,42 65,82 69,88 5,6 -21,46 -61,97 -39,47 -70,89 -70,92 0,3 22,5 50,5 48,0 50,-1 91,-55zM1390,2021l0,-59 79,-3c94,-5 129,-25 149,-84 17,-50 -1,-109 -41,-139 -25,-18 -45,-21 -153,-24l-124,-4 0,180c0,98 3,182 7,185 3,4 24,7 45,7l38,0 0,-59zM1758,2013c4,-84 22,-83 97,2 55,63 58,65 106,65 27,0 49,-3 49,-6 0,-3 -24,-33 -54,-67l-55,-61 28,-17c60,-36 77,-98 45,-160 -23,-46 -67,-59 -194,-59l-110,0 0,186 0,185 43,-3 42,-3 3,-62zM2328,2038l3,-38 -105,0 -106,0 0,-35 0,-35 100,0 100,0 0,-35 0,-35 -100,0 -100,0 0,-35 0,-35 106,0 105,0 -3,-37 -3,-38 -145,0 -145,0 -3,170c-1,93 0,175 3,182 3,11 37,13 147,11l143,-3 3,-37zM2603,2066c52,-22 72,-51 72,-108 0,-42 -4,-53 -28,-74 -24,-20 -39,-24 -93,-24 -73,0 -104,-12 -104,-39 0,-26 19,-31 111,-31l79,0 15,-36c8,-20 15,-39 15,-41 0,-3 -53,-3 -117,-1 -131,4 -161,15 -183,69 -16,38 -6,97 20,123 16,17 37,22 102,26 61,4 84,9 91,22 8,12 7,21 -2,32 -11,13 -34,16 -112,16l-99,0 0,40 0,40 100,0c63,0 113,-5 133,-14z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M77.69,46.26l-0.06,-1.45l0.83,1.41l3.04,4.84h2.36v-8.65h-1.93v4.6l0.06,1.46l-0.84,-1.43l-2.93,-4.62h-2.48v8.65h1.95V46.26L77.69,46.26zM69.54,45.56l0.63,-1.69l0.64,1.69l0.85,2.1H68.7L69.54,45.56L69.54,45.56zM73.03,51.07h2.27l-3.69,-8.65h-2.69l-3.71,8.65h2.11l0.73,-1.83h4.24L73.03,51.07L73.03,51.07zM64.04,51.07h0.1l0.84,-1.82h-0.62c-1.43,0 -2.27,-0.89 -2.27,-2.45v-0.12c0,-1.4 0.77,-2.43 2.25,-2.43h2.22v-1.83h-2.38c-2.66,0 -4.13,1.79 -4.13,4.24v0.17C60.05,49.38 61.54,51.05 64.04,51.07M56.75,51.07h2.04v-4.32v-4.32h-2.04v4.32V51.07L56.75,51.07zM52.45,44.23c0.74,0 1.11,0.45 1.11,0.99c0,0.54 -0.37,0.99 -1.11,0.99h-2.45v-1.98H52.45L52.45,44.23zM50.01,47.9h0.96l2.63,3.17h2.54l-2.85,-3.25c1.46,-0.27 2.32,-1.31 2.32,-2.68c0,-1.59 -1.14,-2.72 -2.98,-2.72h-4.67v8.65h2.04V47.9L50.01,47.9zM46.54,44.2v-1.78h-6.88v8.65h6.88v-1.75h-4.84V47.6h4.73v-1.74h-4.73V44.2H46.54L46.54,44.2zM29.46,45.4l-0.07,-1.99l0.63,1.99l1.82,5.67h1.89l1.83,-5.67l0.63,-2l-0.07,2l-0.02,5.67H38v-8.65h-3.21l-1.47,4.53l-0.53,1.94l-0.53,-1.94l-1.47,-4.53h-3.22v8.65h1.93L29.46,45.4L29.46,45.4zM21.36,45.56l0.63,-1.69l0.64,1.69l0.85,2.1h-2.96L21.36,45.56L21.36,45.56zM24.86,51.07h2.27l-3.69,-8.65h-2.69l-3.71,8.65h2.11l0.73,-1.83h4.24L24.86,51.07L24.86,51.07z"
+      android:fillColor="#006FCF"/>
   <path
-      android:pathData="M1390,1835l0,-45 59,0c60,0 91,15 91,45 0,30 -31,45 -91,45l-59,0 0,-45z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M1760,1830l0,-41 61,3c46,2 65,8 73,21 21,33 -4,52 -73,55l-61,3 0,-41z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M2971,1880c-18,-16 -38,-20 -90,-20 -78,0 -113,-17 -95,-47 9,-15 27,-19 98,-21l87,-3 14,-32c14,-31 14,-28 15,56 0,48 -1,87 -2,87 -2,-1 -14,-10 -27,-20z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10,1420l0,-40 45,0c43,0 46,-2 61,-40l16,-40 85,0 85,0 15,40c16,39 17,40 65,40 26,0 48,-2 48,-4 0,-2 -33,-82 -74,-178l-75,-173 -61,0 -62,0 -71,168 -72,169 -3,-91c-3,-90 -2,-92 49,-211l51,-120 107,0 106,0 22,48 21,47 1,-47 1,-48 134,0 133,0 13,46c14,50 22,48 40,-8l12,-38 564,0c548,0 564,1 564,19 0,19 1,19 50,0 43,-16 78,-19 254,-19l203,0 18,48c26,71 35,73 35,9l0,-57 104,0 105,0 25,43 26,42 0,-42 0,-43 115,0 115,0 0,260 0,260 -108,0 -108,0 -25,-42 -24,-43 -3,43 -3,42 -159,0 -159,0 -12,-40c-11,-37 -15,-40 -46,-40 -31,0 -36,4 -51,41l-16,42 -131,-5c-93,-4 -140,-10 -162,-22 -41,-20 -43,-20 -43,4 0,19 -7,20 -157,20l-158,0 -32,-37 -32,-38 -1,38 0,37 -583,0 -584,0 -16,-40c-14,-36 -19,-40 -50,-40 -31,0 -35,3 -46,40l-12,40 -74,0 -75,0 0,-40zM530,1238c0,-79 4,-136 9,-128 4,8 25,72 46,143l39,127 41,0 41,0 44,-135c24,-74 47,-135 50,-135 3,0 4,61 2,135l-4,135 46,0 46,0 0,-180 0,-181 -72,3 -72,3 -40,123 -40,124 -40,-126 -39,-126 -69,0 -68,0 0,180 0,180 40,0 40,0 0,-142zM1240,1340l0,-40 -100,0 -100,0 0,-30 0,-29 98,-3 97,-3 3,-37 3,-38 -100,0 -101,0 0,-35 0,-35 100,0 100,0 0,-35 0,-35 -145,0 -145,0 0,180 0,180 145,0 145,0 0,-40zM1390,1315c0,-56 2,-65 18,-65 11,0 41,28 71,65l53,65 56,0 55,0 -24,-27c-13,-16 -39,-45 -59,-67 -25,-28 -31,-40 -21,-43 7,-3 28,-18 45,-33 27,-25 31,-35 31,-80 0,-46 -4,-55 -33,-81 -32,-29 -33,-29 -157,-29l-125,0 0,180 0,180 45,0 45,0 0,-65zM1750,1200l0,-180 -45,0 -45,0 0,180 0,180 45,0 45,0 0,-180zM1993,1340c15,-40 15,-40 -8,-40 -61,0 -95,-39 -95,-109 0,-65 25,-85 112,-91l73,-5 3,-37 3,-38 -84,0c-71,0 -89,4 -117,23 -51,34 -70,68 -77,130 -10,94 33,176 103,197 58,17 70,13 87,-30zM2123,1340l15,-40 86,0 86,0 16,40c16,39 17,40 65,40l49,0 -13,-32c-8,-18 -43,-100 -77,-181l-64,-148 -60,3 -60,3 -73,169c-40,94 -73,174 -73,178 0,4 20,8 43,8 42,0 45,-2 60,-40zM2542,1260l3,-119 74,119 74,120 53,0 54,0 0,-180 0,-180 -46,0 -45,0 3,120c2,66 3,120 2,120 0,0 -34,-54 -75,-120l-74,-120 -57,0 -58,0 0,180 0,180 45,0 44,0 3,-120z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M1390,1135l0,-35 65,0c52,0 67,4 72,16 12,33 -11,49 -76,52l-61,3 0,-36z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M2176,1208c4,-13 16,-45 28,-72l22,-50 21,55c12,30 24,62 28,72 6,15 0,17 -50,17 -54,0 -56,-1 -49,-22z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M186,1163c14,-38 27,-69 29,-71 2,-3 55,123 55,133 0,3 -25,5 -55,5l-54,0 25,-67z"
-      android:fillColor="#feffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M299.19,46.24v1.05h-2.04v5.31h-1.26V47.3h-2.01v-1.05H299.19zM306.07,52.61l-0.23,-3.75c-0.02,-0.49 -0.02,-1.08 -0.05,-1.78h-0.07c-0.16,0.56 -0.35,1.31 -0.54,1.9l-1.15,3.54h-1.31l-1.12,-3.63c-0.12,-0.47 -0.33,-1.24 -0.47,-1.8h-0.07c0,0.58 -0.02,1.22 -0.05,1.78l-0.23,3.75h-1.22l0.47,-6.37h1.92l1.08,3.11c0.16,0.49 0.28,0.96 0.42,1.62h0.05c0.14,-0.56 0.3,-1.12 0.42,-1.57l1.1,-3.16h1.85l0.47,6.37H306.07z"
+      android:fillColor="#878A8F"/>
 </vector>
diff --git a/sdk/src/main/res/drawable/ds_logo_amex_dark.xml b/sdk/src/main/res/drawable/ds_logo_amex_dark.xml
index 7b876b59..80ed8f94 100644
--- a/sdk/src/main/res/drawable/ds_logo_amex_dark.xml
+++ b/sdk/src/main/res/drawable/ds_logo_amex_dark.xml
@@ -1,78 +1,42 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="111dp"
-    android:height="28dp"
-    android:viewportWidth="11840"
-    android:viewportHeight="3000">
+    android:width="316.4dp"
+    android:height="108dp"
+    android:viewportWidth="316.4"
+    android:viewportHeight="108">
   <path
-      android:pathData="M10,1500l0,-1490 1495,0 1495,0 2,972c2,535 2,1206 0,1491l-2,517 -1495,0 -1495,0 0,-1490z"
-      android:fillColor="#006fcf"
-      android:strokeColor="#00000000"/>
+      android:pathData="M112.31,63.43l4.75,-2.49c2.11,4.17 5.37,6.19 9.78,6.19c4.32,0 7.24,-1.39 7.24,-4.6c0,-3.07 -2.21,-4.51 -8.06,-6.24c-6.86,-2.01 -12.38,-3.89 -12.38,-10.65c0,-6.04 4.94,-10.03 12.14,-10.03c7,0 11.13,3.45 13.29,7.63l-4.36,3.02c-2.11,-3.55 -5.13,-5.18 -8.97,-5.18c-3.93,0 -6.19,1.44 -6.19,4.03c0,3.31 2.54,4.41 8.35,6.14c6.71,1.97 12.09,4.17 12.09,10.84c0,5.8 -4.94,10.36 -13.38,10.36C119.56,72.45 114.57,68.8 112.31,63.43z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M10497,2633c-38,-6 -41,-20 -22,-86l16,-56 103,6c93,5 108,4 149,-16 54,-26 88,-72 122,-166l26,-70 -194,-506c-107,-278 -198,-515 -201,-527 -7,-21 -5,-22 81,-22l89,0 154,425c84,233 156,423 158,420 3,-2 73,-192 156,-422l151,-418 83,-3c49,-2 82,1 82,7 0,19 -453,1187 -485,1251 -43,86 -115,153 -186,174 -50,15 -208,20 -282,9z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M142.73,65.64c0,-5.52 4.7,-9.21 16.6,-10.55v-0.77c0,-2.54 -1.34,-3.64 -4.17,-3.64c-3.55,0 -6.43,1.73 -8.59,3.45l-2.88,-3.69c2.74,-2.49 7,-4.6 12.28,-4.6c6.81,0 9.16,3.26 9.16,9.21v10.51c0,3.07 0.19,4.94 0.72,6.24h-5.95c-0.34,-1.05 -0.58,-1.82 -0.58,-3.26c-2.59,2.64 -5.61,3.65 -9.4,3.65C145.8,72.16 142.73,69.86 142.73,65.64zM159.33,64.68v-5.61c-7.05,0.96 -10.79,2.69 -10.79,5.47c0,2.01 1.39,3.07 3.55,3.07C155.11,67.6 157.46,66.45 159.33,64.68z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M4474,2260c-90,-13 -140,-28 -219,-67 -89,-46 -200,-154 -243,-239l-30,-60 96,-51 97,-51 44,65c52,76 126,135 207,166 75,27 254,30 322,4 91,-35 141,-97 142,-176 0,-105 -86,-176 -292,-240 -364,-114 -458,-167 -527,-296 -24,-45 -26,-60 -26,-160 0,-104 2,-114 32,-176 57,-115 171,-198 311,-228 75,-16 255,-13 331,4 132,32 258,117 333,227 46,69 50,61 -60,136l-73,50 -77,-77c-103,-104 -153,-125 -307,-125 -98,-1 -115,2 -160,24 -71,36 -98,79 -93,152 5,67 36,114 101,152 23,14 138,57 255,95 116,38 239,84 273,102 85,45 152,112 186,184 25,53 28,71 28,160 0,87 -4,107 -27,158 -35,74 -113,156 -188,196 -111,59 -300,90 -436,71z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M173.34,71.77V51.01h-4.41v-4.7h4.41v-2.59c0,-4.27 1.78,-7.58 8.25,-7.58c1.1,0 3.07,0.19 3.5,0.24v4.56c-0.38,-0.1 -1.34,-0.19 -2.01,-0.19c-2.11,0 -3.84,0.58 -3.84,3.31v2.25h5.56v4.7h-5.56v20.77H173.34z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M7456,2244c-166,-40 -288,-160 -340,-334 -26,-83 -31,-249 -12,-339 60,-283 302,-450 581,-402 230,40 351,209 371,516l7,105 -367,0 -368,0 7,33c26,128 87,202 191,233 109,31 258,0 341,-71 23,-19 45,-35 50,-35 5,0 35,27 68,61l60,60 -50,45c-134,119 -357,172 -539,128zM7830,1581c0,-38 -24,-103 -52,-141 -12,-17 -46,-42 -75,-56 -45,-23 -63,-26 -126,-22 -61,3 -83,9 -122,33 -55,34 -100,105 -111,173l-7,42 247,0 246,0 0,-29z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M186.92,59.06c0,-9.69 6.86,-13.24 12.14,-13.24c5.71,0 11.18,3.41 11.18,13.77v1.39h-17.41c0.24,4.6 3.07,6.62 6.81,6.62c3.31,0 5.23,-1.1 7.15,-2.97l3.12,3.07c-2.64,2.93 -6.14,4.6 -10.7,4.6C192.82,72.3 186.92,68.42 186.92,59.06zM204.81,56.57c-0.34,-3.89 -2.25,-5.95 -5.8,-5.95c-2.88,0 -5.52,1.63 -6.09,5.95H204.81z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M9815,2247c-236,-62 -368,-279 -352,-578 6,-125 34,-216 92,-303 47,-71 101,-116 191,-158 66,-32 74,-33 189,-33 114,0 123,2 187,32 36,17 85,51 109,75 82,83 138,245 139,396l0,72 -371,0 -372,0 6,58c8,91 43,169 101,228 62,62 128,87 225,86 101,-1 173,-32 247,-106l62,-62 48,42 48,42 -42,50c-51,61 -132,116 -210,143 -73,26 -227,34 -297,16zM10210,1601c0,-62 -39,-158 -85,-209 -56,-62 -108,-84 -198,-84 -116,0 -205,58 -257,169 -23,50 -43,130 -35,144 4,5 125,9 291,9l284,0 0,-29z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M215.51,71.77v-35.5h4.22V54.6l16.07,-18.32h5.08l-12.18,13.53l13.86,21.97h-4.85l-11.8,-18.75l-6.19,6.76v11.99H215.51z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M5425,2238c-55,-20 -109,-63 -140,-112 -28,-46 -30,-57 -30,-140 0,-79 4,-98 28,-148 68,-138 269,-237 566,-279l93,-13 -4,-53c-5,-62 -39,-105 -96,-124 -45,-15 -172,-6 -232,15 -42,16 -142,70 -186,101 -20,15 -24,12 -79,-60l-57,-75 23,-20c141,-119 383,-188 573,-162 155,20 233,81 279,217 5,16 13,201 18,410 4,209 10,395 14,413l7,32 -120,0 -120,0 -11,-44c-6,-25 -11,-54 -11,-65 0,-28 -6,-26 -47,9 -44,39 -119,77 -190,95 -66,17 -233,19 -278,3zM5790,2040c30,-12 76,-37 102,-57l48,-35 0,-120 0,-120 -52,7c-88,12 -232,52 -285,78 -27,14 -65,42 -83,63 -30,34 -32,42 -28,91 5,60 32,97 82,113 46,14 154,4 216,-20z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M243.77,59.11c0,-9.21 6.14,-13.19 11.46,-13.19c6,0 10.55,4.22 10.55,13.38v0.86H247.9c0.14,5.71 3.45,8.78 7.63,8.78c3.64,0 5.71,-1.49 7.63,-4.12l2.4,2.11c-2.35,3.36 -5.56,5.37 -10.31,5.37C249.24,72.3 243.77,67.94 243.77,59.11zM261.86,56.95c-0.34,-4.51 -2.49,-7.58 -6.67,-7.58c-3.41,0 -6.62,2.35 -7.2,7.58H261.86z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M6528,1808l-3,-433 -92,-3 -93,-3 0,-94 0,-94 93,-3 92,-3 5,-115c4,-91 10,-123 27,-155 52,-98 130,-137 290,-143 61,-2 123,-2 137,2 25,6 26,8 26,95l0,89 -91,4c-88,3 -92,4 -120,36 -27,30 -29,38 -29,112l0,80 115,0 115,0 0,95 0,95 -115,0 -115,0 0,435 0,435 -120,0 -120,0 -2,-432z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M267.67,80.89l0.96,-3.31c0.72,0.19 1.97,0.43 3.74,0.43c2.59,0 3.84,-1.1 4.84,-3.6l0.96,-2.49l-9.78,-25.47h4.36l7.43,20.48h0.1l7.44,-20.48h4.17l-10.84,28.21c-1.73,4.46 -3.69,6.86 -8.63,6.86C270.16,81.51 268.77,81.22 267.67,80.89z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M8280,1500l0,-740 85,0 85,0 0,382 0,381 23,-21c13,-12 165,-184 338,-382l314,-359 104,-1 105,0 -25,27c-135,147 -479,532 -479,536 0,3 128,208 285,456 157,249 285,454 285,457 0,2 -44,4 -97,4l-98,0 -245,-390c-135,-215 -247,-389 -251,-388 -3,2 -62,65 -132,141l-127,138 0,250 0,249 -85,0 -85,0 0,-740z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M88.82,89.93l-35.53,0l-36.28,0l0,-34.27l0,-37.54l35.69,0l36.12,0l0,37.65l0,34.16z"
+      android:fillColor="#FFFFFF"/>
   <path
-      android:pathData="M510,1895l0,-255 268,0 267,0 20,30c11,16 23,30 27,30 4,0 16,-13 28,-30l21,-30 930,0 929,0 0,35 0,35 -94,0c-51,0 -107,3 -125,6 -69,14 -109,95 -77,160 20,42 49,54 130,54 64,0 86,11 86,41 0,24 -20,29 -126,29l-95,0 3,38 3,37 90,3c101,4 155,-8 185,-40l20,-22 0,56c0,54 -1,56 -31,67 -22,7 -203,11 -564,11l-532,0 -26,-37 -27,-38 0,38 0,37 -115,0 -115,0 0,-66c0,-57 -2,-65 -17,-60 -10,2 -37,8 -60,11l-43,7 0,54 0,54 -162,0 -163,0 -27,-32 -28,-33 -27,33 -28,32 -262,0 -263,0 0,-255zM880,2040l0,-40 -100,0 -100,0 0,-35 0,-35 100,0 100,0 0,-35 0,-35 -100,0 -100,0 0,-35 0,-35 100,0 100,0 0,-40 0,-40 -145,0 -145,0 0,178c0,98 3,182 7,185 3,4 69,7 145,7l138,0 0,-40zM1041,2025c23,-30 45,-55 49,-55 4,0 26,25 49,55 41,54 43,55 91,55 28,0 50,-3 50,-7 0,-5 -30,-46 -67,-92 -76,-95 -77,-80 14,-192 29,-36 53,-69 53,-73 0,-3 -22,-6 -49,-6 -47,0 -50,2 -90,55 -23,30 -45,55 -50,55 -4,0 -25,-25 -47,-55 -39,-54 -39,-55 -91,-55 -29,0 -53,3 -53,6 0,3 28,40 62,82 34,42 65,82 69,88 5,6 -21,46 -61,97 -39,47 -70,89 -70,92 0,3 22,5 50,5 48,0 50,-1 91,-55zM1390,2021l0,-59 79,-3c94,-5 129,-25 149,-84 17,-50 -1,-109 -41,-139 -25,-18 -45,-21 -153,-24l-124,-4 0,180c0,98 3,182 7,185 3,4 24,7 45,7l38,0 0,-59zM1758,2013c4,-84 22,-83 97,2 55,63 58,65 106,65 27,0 49,-3 49,-6 0,-3 -24,-33 -54,-67l-55,-61 28,-17c60,-36 77,-98 45,-160 -23,-46 -67,-59 -194,-59l-110,0 0,186 0,185 43,-3 42,-3 3,-62zM2328,2038l3,-38 -105,0 -106,0 0,-35 0,-35 100,0 100,0 0,-35 0,-35 -100,0 -100,0 0,-35 0,-35 106,0 105,0 -3,-37 -3,-38 -145,0 -145,0 -3,170c-1,93 0,175 3,182 3,11 37,13 147,11l143,-3 3,-37zM2603,2066c52,-22 72,-51 72,-108 0,-42 -4,-53 -28,-74 -24,-20 -39,-24 -93,-24 -73,0 -104,-12 -104,-39 0,-26 19,-31 111,-31l79,0 15,-36c8,-20 15,-39 15,-41 0,-3 -53,-3 -117,-1 -131,4 -161,15 -183,69 -16,38 -6,97 20,123 16,17 37,22 102,26 61,4 84,9 91,22 8,12 7,21 -2,32 -11,13 -34,16 -112,16l-99,0 0,40 0,40 100,0c63,0 113,-5 133,-14z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M86.04,69.72H61.86l-1.33,-1.73v1.73h-5.55v-3.27c-0.77,0.31 -1.66,0.48 -2.63,0.48h-0.3v2.79h-7.87l-1.24,-1.74l-1.21,1.74H29.05v-12.5h12.74l1.22,1.7l1.22,-1.7h44.59v-39.1H17.01v28.11l2.46,-5.74h5.11l1.14,2.63V40.5h6.32l0.8,2.27l0.79,-2.27h27.18v1.01c1.02,-0.69 2.29,-1.01 3.64,-1.01h8.41l1.14,2.63V40.5h5.16l1.2,1.95V40.5h5.61V53h-5.3l-1.12,-1.84V53h-7.75l-0.72,-1.84h-1.51L68.88,53h-4.56c-1.12,0 -2.42,-0.21 -3.51,-0.92V53h-7.78l-1.33,-1.73V53H23.52l-0.72,-1.84H21.3L20.6,53h-3.58v36.94h71.81V68.98C88.06,69.45 87.1,69.72 86.04,69.72L86.04,69.72z"
+      android:fillColor="#006FCF"/>
   <path
-      android:pathData="M1390,1835l0,-45 59,0c60,0 91,15 91,45 0,30 -31,45 -91,45l-59,0 0,-45z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M86.09,65.99h-4.41v1.8h4.34c1.87,0 2.98,-1.14 2.98,-2.74c0,-1.56 -1.01,-2.47 -2.69,-2.47h-1.96c-0.51,0 -0.86,-0.33 -0.86,-0.83c0,-0.48 0.36,-0.8 0.86,-0.8h3.71l0.8,-1.8h-4.43c-1.85,0 -2.98,1.14 -2.98,2.69c0,1.61 1.06,2.51 2.69,2.51h1.96c0.51,0 0.86,0.32 0.86,0.84C86.95,65.67 86.59,65.99 86.09,65.99M78.13,65.99h-4.41v1.8h4.34c1.87,0 2.98,-1.14 2.98,-2.74c0,-1.56 -1.01,-2.47 -2.69,-2.47h-1.96c-0.51,0 -0.86,-0.33 -0.86,-0.83c0,-0.48 0.36,-0.8 0.86,-0.8h3.71l0.8,-1.8h-4.43c-1.85,0 -2.98,1.14 -2.98,2.69c0,1.61 1.06,2.51 2.69,2.51h1.96c0.51,0 0.86,0.32 0.86,0.84C79,65.67 78.64,65.99 78.13,65.99M72.57,60.93v-1.78h-6.88v8.65h6.88v-1.75h-4.84v-1.72h4.73v-1.74h-4.73v-1.65H72.57L72.57,60.93zM61.39,60.95c0.74,0 1.11,0.44 1.11,0.99c0,0.54 -0.37,0.99 -1.11,0.99h-2.45v-1.98H61.39L61.39,60.95zM58.95,64.62h0.96l2.63,3.17h2.54l-2.85,-3.25c1.46,-0.27 2.32,-1.31 2.32,-2.68c0,-1.59 -1.14,-2.72 -2.98,-2.72h-4.67v8.65h2.04V64.62L58.95,64.62zM53.72,62.05c0,0.59 -0.37,1.07 -1.11,1.07H50.1v-2.17h2.51C53.35,60.95 53.72,61.43 53.72,62.05M48.06,59.15v8.65h2.04v-2.87h2.62c1.89,0 3.05,-1.24 3.05,-2.89c0,-1.72 -1.14,-2.89 -2.98,-2.89H48.06L48.06,59.15zM45.11,67.8h2.54l-3.48,-4.36l3.46,-4.29h-2.47l-2.15,2.8l-2.14,-2.8h-2.54l3.47,4.32l-3.46,4.32h2.47l2.15,-2.83L45.11,67.8L45.11,67.8zM37.95,60.93v-1.78h-6.88v8.65h6.88v-1.75h-4.84v-1.72h4.73v-1.74h-4.73v-1.65H37.95L37.95,60.93z"
+      android:fillColor="#006FCF"/>
   <path
-      android:pathData="M1760,1830l0,-41 61,3c46,2 65,8 73,21 21,33 -4,52 -73,55l-61,3 0,-41z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M77.69,46.26l-0.06,-1.45l0.83,1.41l3.04,4.84h2.36v-8.65h-1.93v4.6l0.06,1.46l-0.84,-1.43l-2.93,-4.62h-2.48v8.65h1.95V46.26L77.69,46.26zM69.54,45.56l0.63,-1.69l0.64,1.69l0.85,2.1H68.7L69.54,45.56L69.54,45.56zM73.03,51.07h2.27l-3.69,-8.65h-2.69l-3.71,8.65h2.11l0.73,-1.83h4.24L73.03,51.07L73.03,51.07zM64.04,51.07h0.1l0.84,-1.82h-0.62c-1.43,0 -2.27,-0.89 -2.27,-2.45v-0.12c0,-1.4 0.77,-2.43 2.25,-2.43h2.22v-1.83h-2.38c-2.66,0 -4.13,1.79 -4.13,4.24v0.17C60.05,49.38 61.54,51.05 64.04,51.07M56.75,51.07h2.04v-4.32v-4.32h-2.04v4.32V51.07L56.75,51.07zM52.45,44.23c0.74,0 1.11,0.45 1.11,0.99c0,0.54 -0.37,0.99 -1.11,0.99h-2.45v-1.98H52.45L52.45,44.23zM50.01,47.9h0.96l2.63,3.17h2.54l-2.85,-3.25c1.46,-0.27 2.32,-1.31 2.32,-2.68c0,-1.59 -1.14,-2.72 -2.98,-2.72h-4.67v8.65h2.04V47.9L50.01,47.9zM46.54,44.2v-1.78h-6.88v8.65h6.88v-1.75h-4.84V47.6h4.73v-1.74h-4.73V44.2H46.54L46.54,44.2zM29.46,45.4l-0.07,-1.99l0.63,1.99l1.82,5.67h1.89l1.83,-5.67l0.63,-2l-0.07,2l-0.02,5.67H38v-8.65h-3.21l-1.47,4.53l-0.53,1.94l-0.53,-1.94l-1.47,-4.53h-3.22v8.65h1.93L29.46,45.4L29.46,45.4zM21.36,45.56l0.63,-1.69l0.64,1.69l0.85,2.1h-2.96L21.36,45.56L21.36,45.56zM24.86,51.07h2.27l-3.69,-8.65h-2.69l-3.71,8.65h2.11l0.73,-1.83h4.24L24.86,51.07L24.86,51.07z"
+      android:fillColor="#006FCF"/>
   <path
-      android:pathData="M2971,1880c-18,-16 -38,-20 -90,-20 -78,0 -113,-17 -95,-47 9,-15 27,-19 98,-21l87,-3 14,-32c14,-31 14,-28 15,56 0,48 -1,87 -2,87 -2,-1 -14,-10 -27,-20z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M11600,1472c-40,-21 -80,-90 -80,-137 1,-54 34,-112 79,-134 110,-57 231,11 231,129 0,120 -124,197 -230,142zM11767,1427c33,-32 44,-85 28,-131 -18,-51 -41,-74 -86,-86 -87,-24 -165,42 -156,133 10,109 139,160 214,84z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M11620,1335l0,-85 48,0c26,0 52,4 58,8 21,14 24,44 8,71 -15,25 -15,30 0,59 16,31 16,32 -3,32 -11,0 -27,-14 -40,-35 -11,-19 -25,-35 -31,-35 -5,0 -10,16 -10,35 0,24 -5,35 -15,35 -12,0 -15,-16 -15,-85zM11699,1321c21,-13 5,-41 -24,-41 -18,0 -25,5 -25,18 0,31 21,41 49,23z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M10,1420l0,-40 45,0c43,0 46,-2 61,-40l16,-40 85,0 85,0 15,40c16,39 17,40 65,40 26,0 48,-2 48,-4 0,-2 -33,-82 -74,-178l-75,-173 -61,0 -62,0 -71,168 -72,169 -3,-91c-3,-90 -2,-92 49,-211l51,-120 107,0 106,0 22,48 21,47 1,-47 1,-48 134,0 133,0 13,46c14,50 22,48 40,-8l12,-38 564,0c548,0 564,1 564,19 0,19 1,19 50,0 43,-16 78,-19 254,-19l203,0 18,48c26,71 35,73 35,9l0,-57 104,0 105,0 25,43 26,42 0,-42 0,-43 115,0 115,0 0,260 0,260 -108,0 -108,0 -25,-42 -24,-43 -3,43 -3,42 -159,0 -159,0 -12,-40c-11,-37 -15,-40 -46,-40 -31,0 -36,4 -51,41l-16,42 -131,-5c-93,-4 -140,-10 -162,-22 -41,-20 -43,-20 -43,4 0,19 -7,20 -157,20l-158,0 -32,-37 -32,-38 -1,38 0,37 -583,0 -584,0 -16,-40c-14,-36 -19,-40 -50,-40 -31,0 -35,3 -46,40l-12,40 -74,0 -75,0 0,-40zM530,1238c0,-79 4,-136 9,-128 4,8 25,72 46,143l39,127 41,0 41,0 44,-135c24,-74 47,-135 50,-135 3,0 4,61 2,135l-4,135 46,0 46,0 0,-180 0,-181 -72,3 -72,3 -40,123 -40,124 -40,-126 -39,-126 -69,0 -68,0 0,180 0,180 40,0 40,0 0,-142zM1240,1340l0,-40 -100,0 -100,0 0,-30 0,-29 98,-3 97,-3 3,-37 3,-38 -100,0 -101,0 0,-35 0,-35 100,0 100,0 0,-35 0,-35 -145,0 -145,0 0,180 0,180 145,0 145,0 0,-40zM1390,1315c0,-56 2,-65 18,-65 11,0 41,28 71,65l53,65 56,0 55,0 -24,-27c-13,-16 -39,-45 -59,-67 -25,-28 -31,-40 -21,-43 7,-3 28,-18 45,-33 27,-25 31,-35 31,-80 0,-46 -4,-55 -33,-81 -32,-29 -33,-29 -157,-29l-125,0 0,180 0,180 45,0 45,0 0,-65zM1750,1200l0,-180 -45,0 -45,0 0,180 0,180 45,0 45,0 0,-180zM1993,1340c15,-40 15,-40 -8,-40 -61,0 -95,-39 -95,-109 0,-65 25,-85 112,-91l73,-5 3,-37 3,-38 -84,0c-71,0 -89,4 -117,23 -51,34 -70,68 -77,130 -10,94 33,176 103,197 58,17 70,13 87,-30zM2123,1340l15,-40 86,0 86,0 16,40c16,39 17,40 65,40l49,0 -13,-32c-8,-18 -43,-100 -77,-181l-64,-148 -60,3 -60,3 -73,169c-40,94 -73,174 -73,178 0,4 20,8 43,8 42,0 45,-2 60,-40zM2542,1260l3,-119 74,119 74,120 53,0 54,0 0,-180 0,-180 -46,0 -45,0 3,120c2,66 3,120 2,120 0,0 -34,-54 -75,-120l-74,-120 -57,0 -58,0 0,180 0,180 45,0 44,0 3,-120z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M1390,1135l0,-35 65,0c52,0 67,4 72,16 12,33 -11,49 -76,52l-61,3 0,-36z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M2176,1208c4,-13 16,-45 28,-72l22,-50 21,55c12,30 24,62 28,72 6,15 0,17 -50,17 -54,0 -56,-1 -49,-22z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
-  <path
-      android:pathData="M186,1163c14,-38 27,-69 29,-71 2,-3 55,123 55,133 0,3 -25,5 -55,5l-54,0 25,-67z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#00000000"/>
+      android:pathData="M299.19,46.24v1.05h-2.04v5.31h-1.26V47.3h-2.01v-1.05H299.19zM306.07,52.61l-0.23,-3.75c-0.02,-0.49 -0.02,-1.08 -0.05,-1.78h-0.07c-0.16,0.56 -0.35,1.31 -0.54,1.9l-1.15,3.54h-1.31l-1.12,-3.63c-0.12,-0.47 -0.33,-1.24 -0.47,-1.8h-0.07c0,0.58 -0.02,1.22 -0.05,1.78l-0.23,3.75h-1.22l0.47,-6.37h1.92l1.08,3.11c0.16,0.49 0.28,0.96 0.42,1.62h0.05c0.14,-0.56 0.3,-1.12 0.42,-1.57l1.1,-3.16h1.85l0.47,6.37H306.07z"
+      android:fillColor="#FFFFFF"/>
 </vector>
diff --git a/sdk/src/main/res/raw/keep.xml b/sdk/src/main/res/raw/keep.xml
new file mode 100644
index 00000000..387586f2
--- /dev/null
+++ b/sdk/src/main/res/raw/keep.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools"
+  tools:keep="
+        @drawable/ds_logo_amex,
+        @drawable/ds_logo_amex_dark,
+        @drawable/ds_logo_diners,
+        @drawable/ds_logo_mastercard,
+        @drawable/ds_logo_mastercard_dark,
+        @drawable/ds_logo_visa,
+        @drawable/ic_password_toggle_masked,
+        @drawable/ic_password_toggle_visible,
+        @drawable/cb_bakground,
+        @drawable/ds_logo_cb,
+        @drawable/ds_logo_eftpos,
+        @drawable/ds_logo_jcb,
+        @drawable/ds_logo_union,
+        @values/challenge_ui_ids
+    " />