diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e0291d44b9..46fd647422b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Payments
 * [FIXED][5079](https://github.com/stripe/stripe-android/pull/5079) Add 3ds2 url to list of completion URLs so callbacks work correctly.
+* [FIXED][5094](https://github.com/stripe/stripe-android/pull/5094) Use correct cvc icon in card form view
 
 ## 20.4.0 - 2022-05-23
 This release adds [appearance customization APIs](https://github.com/stripe/stripe-android/blob/master/paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheet.kt#L186) to payment sheet and enables Affirm and AU BECS direct debit as payment methods within Payment Sheet.
diff --git a/payments-core/res/drawable-night/stripe_ic_paymentsheet_cvc.xml b/payments-core/res/drawable-night/stripe_ic_paymentsheet_cvc.xml
deleted file mode 100644
index 07a472146e6..00000000000
--- a/payments-core/res/drawable-night/stripe_ic_paymentsheet_cvc.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="16dp"
-    android:viewportWidth="25"
-    android:viewportHeight="16">
-    <group>
-        <clip-path android:pathData="M0,0h24.381v16h-24.381z" />
-        <path
-            android:pathData="M16.5181,1.5238H1.5238C0.8229,1.5238 0,2.3314 0,3.0476V14.4762C0,15.1924 0.8229,16 1.5238,16H20.5714C21.2724,16 22.0952,15.1924 22.0952,14.4762V8.739C21.4534,9.3164 20.6607,9.6995 19.8095,9.8438V9.9048C19.8095,10.4076 19.5352,10.6667 19.0476,10.6667H2.2857C1.7981,10.6667 1.5238,10.4076 1.5238,9.9048V9.1428C1.5238,8.64 1.7981,8.3809 2.2857,8.3809H15.6419C15.2021,7.8935 14.8728,7.3168 14.6766,6.6904C14.4804,6.0638 14.4219,5.4023 14.5051,4.7511C14.5883,4.0999 14.8113,3.4744 15.1587,2.9174C15.5061,2.3603 15.9699,1.885 16.5181,1.5238V1.5238Z"
-            android:fillColor="#ffffff"
-            android:fillAlpha="0.12"
-            android:fillType="evenOdd" />
-        <path
-            android:pathData="M14.7352,3.8095H0V6.0952H14.5371C14.4091,5.3288 14.4773,4.5425 14.7352,3.8095Z"
-            android:fillColor="#ffffff"
-            android:fillAlpha="0.32"
-            android:fillType="evenOdd" />
-        <path
-            android:pathData="M19.0476,10.6667C17.6331,10.6667 16.2766,10.1048 15.2764,9.1046C14.2762,8.1044 13.7143,6.7478 13.7143,5.3333C13.7143,3.9188 14.2762,2.5623 15.2764,1.5621C16.2766,0.5619 17.6331,0 19.0476,0C20.4621,0 21.8187,0.5619 22.8188,1.5621C23.819,2.5623 24.3809,3.9188 24.3809,5.3333C24.3809,6.7478 23.819,8.1044 22.8188,9.1046C21.8187,10.1048 20.4621,10.6667 19.0476,10.6667ZM16.9295,3.1238H16.3276L14.8571,3.8705V4.6324L16.0229,4.0229V7.5429H16.9371V3.1238H16.9295ZM18.6819,3.7333C19.1162,3.7333 19.4209,3.9771 19.4209,4.3276C19.4209,4.7086 19.0629,4.9752 18.5448,4.9752H18.3162V5.6229H18.5905C19.139,5.6229 19.5124,5.8971 19.5124,6.2933C19.5124,6.6743 19.1467,6.9333 18.6286,6.9333C18.2476,6.9333 17.8667,6.8114 17.4705,6.5752V7.3371C17.8971,7.52 18.3238,7.6191 18.7429,7.6191C19.7409,7.6191 20.4267,7.1086 20.4267,6.3695C20.4267,5.8514 20.1067,5.4324 19.5733,5.2648C20.0305,5.1124 20.3276,4.7086 20.3276,4.2514C20.3276,3.5352 19.6952,3.0476 18.7809,3.0476C18.3688,3.0522 17.9619,3.1403 17.5848,3.3067V4.0533C17.9505,3.8476 18.3238,3.7333 18.6819,3.7333ZM21.9733,5.3943C22.5295,5.3943 22.9181,5.7219 22.9181,6.1486C22.9181,6.5981 22.5295,6.9105 21.9733,6.9105C21.6381,6.9105 21.2876,6.8038 20.9295,6.5829V7.3676C21.3029,7.5352 21.6838,7.6191 22.0571,7.6191C22.2552,7.6191 22.4381,7.5886 22.6133,7.5429C23.0095,6.8952 23.2381,6.1486 23.2381,5.3486L23.2229,5.0286C22.9396,4.8609 22.6148,4.7764 22.2857,4.7848C22.1486,4.7848 22.0038,4.7924 21.8514,4.8152V3.8248H22.9486C22.8534,3.5809 22.7361,3.3463 22.5981,3.1238H21.059V5.5238C21.3638,5.4476 21.6686,5.3943 21.9733,5.3943Z"
-            android:fillColor="#ABABAB"
-            android:fillType="evenOdd" />
-    </group>
-</vector>
diff --git a/payments-core/res/drawable/stripe_ic_paymentsheet_cvc.xml b/payments-core/res/drawable/stripe_ic_paymentsheet_cvc.xml
deleted file mode 100644
index 5690e1c4aca..00000000000
--- a/payments-core/res/drawable/stripe_ic_paymentsheet_cvc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="21dp"
-    android:viewportWidth="32.0"
-    android:viewportHeight="21.0">
-    <path
-        android:pathData="M26.58,21L2.42,21A2.4,2.4 0,0 1,0 18.62L0,4.38A2.4,2.4 0,0 1,2.42 2h24.16A2.4,2.4 0,0 1,29 4.38v14.25A2.4,2.4 0,0 1,26.58 21z"
-        android:fillColor="#EBF1F8" />
-    <path
-        android:pathData="M15.24,21h11.34A2.4,2.4 0,0 0,29 18.62v-2.85A46.81,46.81 0,0 1,15.24 21z"
-        android:fillColor="#F27712" />
-    <path
-        android:pathData="M28,12.9h-1.03l-1.16,-1.53h-0.11v1.53h-0.84L24.86,9.1h1.24c0.97,0 1.53,0.4 1.53,1.12 0,0.59 -0.35,0.97 -0.98,1.09L28,12.9zM26.76,10.25c0,-0.37 -0.28,-0.56 -0.8,-0.56h-0.26v1.15h0.24c0.54,0 0.82,-0.2 0.82,-0.59zM21.92,9.1h2.38v0.64h-1.54v0.85h1.48v0.65h-1.48v1.03h1.54v0.64h-2.38L21.92,9.1zM19.22,13L17.4,9.09h0.92l1.15,2.56 1.16,-2.56h0.9L19.69,13h-0.45zM11.61,12.99c-1.28,0 -2.28,-0.87 -2.28,-2 0,-1.1 1.02,-1.99 2.3,-1.99 0.36,0 0.66,0.07 1.03,0.23v0.88a1.5,1.5 0,0 0,-1.05 -0.43c-0.8,0 -1.41,0.58 -1.41,1.31 0,0.77 0.6,1.32 1.45,1.32 0.38,0 0.67,-0.12 1.01,-0.42v0.88c-0.38,0.16 -0.7,0.22 -1.05,0.22zM9.07,11.74c0,0.74 -0.61,1.25 -1.49,1.25 -0.64,0 -1.1,-0.22 -1.49,-0.72l0.55,-0.47c0.19,0.34 0.51,0.51 0.91,0.51 0.38,0 0.65,-0.23 0.65,-0.53 0,-0.17 -0.08,-0.3 -0.25,-0.4a3.48,3.48 0,0 0,-0.58 -0.22c-0.79,-0.25 -1.06,-0.52 -1.06,-1.05 0,-0.62 0.58,-1.09 1.34,-1.09 0.48,0 0.91,0.15 1.27,0.43l-0.44,0.5a0.92,0.92 0,0 0,-0.68 -0.3c-0.36,0 -0.62,0.18 -0.62,0.42 0,0.2 0.15,0.31 0.65,0.48 0.96,0.3 1.24,0.58 1.24,1.2zM4.94,9.1h0.84v3.81h-0.84L4.94,9.1zM2.24,12.91L1,12.91L1,9.1h1.24c1.36,0 2.3,0.78 2.3,1.9 0,0.57 -0.28,1.11 -0.77,1.47 -0.42,0.3 -0.89,0.44 -1.54,0.44zM3.22,10.05c-0.28,-0.22 -0.6,-0.3 -1.15,-0.3h-0.23v2.52h0.23c0.54,0 0.88,-0.1 1.15,-0.3 0.29,-0.24 0.46,-0.6 0.46,-0.97s-0.17,-0.72 -0.46,-0.95z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M15,9c-1.1,0 -2,0.88 -2,1.97 0,1.16 0.86,2.03 2,2.03 1.12,0 2,-0.88 2,-2s-0.87,-2 -2,-2z"
-        android:fillColor="#F27712" />
-</vector>
diff --git a/payments-core/src/main/java/com/stripe/android/view/CardFormView.kt b/payments-core/src/main/java/com/stripe/android/view/CardFormView.kt
index fa731d6096d..e9a49039f1a 100644
--- a/payments-core/src/main/java/com/stripe/android/view/CardFormView.kt
+++ b/payments-core/src/main/java/com/stripe/android/view/CardFormView.kt
@@ -303,7 +303,7 @@ class CardFormView @JvmOverloads constructor(
             layout.error = null
         }
 
-        cardMultilineWidget.setCvcIcon(R.drawable.stripe_ic_paymentsheet_cvc)
+        cardMultilineWidget.setCvcIcon(R.drawable.stripe_ic_cvc)
 
         cardMultilineWidget.cardNumberErrorListener =
             StripeEditText.ErrorMessageListener { errorMessage ->