diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt
index 3e44ce9c82..1e3ad26341 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginScreen.kt
@@ -229,7 +229,7 @@ private fun TwoFactorLoginScreenContent(
             .imePadding()
             .verticalScroll(rememberScrollState()),
     ) {
-        if (state.authMethod == TwoFactorAuthMethod.EMAIL) {
+        if (state.authMethod != TwoFactorAuthMethod.YUBI_KEY) {
             state.imageRes?.let {
                 Spacer(modifier = Modifier.height(12.dp))
                 Image(
@@ -237,7 +237,7 @@ private fun TwoFactorLoginScreenContent(
                     contentDescription = null,
                     modifier = Modifier
                         .standardHorizontalMargin()
-                        .size(100.dp),
+                        .size(124.dp),
                 )
                 Spacer(modifier = Modifier.height(12.dp))
             }
@@ -261,7 +261,7 @@ private fun TwoFactorLoginScreenContent(
 
         Spacer(modifier = Modifier.height(12.dp))
 
-        if (state.authMethod != TwoFactorAuthMethod.EMAIL) {
+        if (state.authMethod == TwoFactorAuthMethod.YUBI_KEY) {
             state.imageRes?.let {
                 Spacer(modifier = Modifier.height(12.dp))
                 Image(
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensions.kt
index 8d3abba9a1..a5eeadc8e6 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensions.kt
@@ -119,5 +119,6 @@ val TwoFactorAuthMethod.imageRes: Int?
     get() = when (this) {
         TwoFactorAuthMethod.YUBI_KEY -> R.drawable.yubi_key
         TwoFactorAuthMethod.EMAIL -> R.drawable.img_new_device_verification
+        TwoFactorAuthMethod.AUTHENTICATOR_APP -> R.drawable.img_authenticator
         else -> null
     }
diff --git a/app/src/main/res/drawable-night/img_authenticator.xml b/app/src/main/res/drawable-night/img_authenticator.xml
new file mode 100644
index 0000000000..64b35b183e
--- /dev/null
+++ b/app/src/main/res/drawable-night/img_authenticator.xml
@@ -0,0 +1,68 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="200"
+    android:viewportHeight="200">
+  <path
+      android:pathData="M33.33,38.17C33.33,31.26 38.93,25.67 45.83,25.67H187.5C194.4,25.67 200,31.26 200,38.17V138.17C200,145.07 194.4,150.67 187.5,150.67H45.83C38.93,150.67 33.33,145.07 33.33,138.17V38.17Z"
+      android:fillColor="#79A1E9"/>
+  <path
+      android:pathData="M187.5,29.83H45.83C41.23,29.83 37.5,33.56 37.5,38.17V138.17C37.5,142.77 41.23,146.5 45.83,146.5H187.5C192.1,146.5 195.83,142.77 195.83,138.17V38.17C195.83,33.56 192.1,29.83 187.5,29.83ZM45.83,25.67C38.93,25.67 33.33,31.26 33.33,38.17V138.17C33.33,145.07 38.93,150.67 45.83,150.67H187.5C194.4,150.67 200,145.07 200,138.17V38.17C200,31.26 194.4,25.67 187.5,25.67H45.83Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M197.92,50.67L35.42,50.67L35.42,46.5L197.92,46.5L197.92,50.67Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M191.67,38.17C191.67,40.47 189.8,42.33 187.5,42.33C185.2,42.33 183.33,40.47 183.33,38.17C183.33,35.87 185.2,34 187.5,34C189.8,34 191.67,35.87 191.67,38.17Z"
+      android:fillColor="#175DDC"/>
+  <path
+      android:pathData="M179.17,38.17C179.17,40.47 177.3,42.33 175,42.33C172.7,42.33 170.83,40.47 170.83,38.17C170.83,35.87 172.7,34 175,34C177.3,34 179.17,35.87 179.17,38.17Z"
+      android:fillColor="#175DDC"/>
+  <path
+      android:pathData="M166.67,38.17C166.67,40.47 164.8,42.33 162.5,42.33C160.2,42.33 158.33,40.47 158.33,38.17C158.33,35.87 160.2,34 162.5,34C164.8,34 166.67,35.87 166.67,38.17Z"
+      android:fillColor="#175DDC"/>
+  <path
+      android:pathData="M37.5,94.42C37.5,85.21 44.96,77.75 54.17,77.75H162.5C171.71,77.75 179.17,85.21 179.17,94.42V102.75C179.17,111.95 171.71,119.42 162.5,119.42H54.17C44.96,119.42 37.5,111.95 37.5,102.75V94.42Z"
+      android:fillColor="#FFBF00"/>
+  <path
+      android:pathData="M162.5,81.92H54.17C47.26,81.92 41.67,87.51 41.67,94.42V102.75C41.67,109.65 47.26,115.25 54.17,115.25H162.5C169.4,115.25 175,109.65 175,102.75V94.42C175,87.51 169.4,81.92 162.5,81.92ZM54.17,77.75C44.96,77.75 37.5,85.21 37.5,94.42V102.75C37.5,111.95 44.96,119.42 54.17,119.42H162.5C171.71,119.42 179.17,111.95 179.17,102.75V94.42C179.17,85.21 171.71,77.75 162.5,77.75H54.17Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M60.42,102.75L60.42,94.91L54.58,106.57C55.09,106.79 55.66,106.92 56.25,106.92C58.55,106.92 60.42,105.05 60.42,102.75ZM52.08,102.26L57.91,90.6C57.4,90.37 56.84,90.25 56.25,90.25C53.95,90.25 52.08,92.11 52.08,94.42V102.26ZM64.58,94.42C64.58,89.81 60.85,86.08 56.25,86.08C51.65,86.08 47.92,89.81 47.92,94.42V102.75C47.92,107.35 51.65,111.08 56.25,111.08C60.85,111.08 64.58,107.35 64.58,102.75L64.58,94.42ZM81.25,94.91V102.75C81.25,105.05 79.38,106.92 77.08,106.92C76.49,106.92 75.93,106.79 75.42,106.57L81.25,94.91ZM78.75,90.6L72.92,102.26V94.42C72.92,92.11 74.78,90.25 77.08,90.25C77.67,90.25 78.24,90.37 78.75,90.6ZM77.08,86.08C81.69,86.08 85.42,89.81 85.42,94.42V102.75C85.42,107.35 81.69,111.08 77.08,111.08C72.48,111.08 68.75,107.35 68.75,102.75V94.42C68.75,89.81 72.48,86.08 77.08,86.08ZM102.08,102.75V94.91L96.25,106.57C96.76,106.79 97.32,106.92 97.92,106.92C100.22,106.92 102.08,105.05 102.08,102.75ZM93.75,102.26L99.58,90.6C99.07,90.37 98.51,90.25 97.92,90.25C95.61,90.25 93.75,92.11 93.75,94.42V102.26ZM106.25,94.42C106.25,89.81 102.52,86.08 97.92,86.08C93.31,86.08 89.58,89.81 89.58,94.42V102.75C89.58,107.35 93.31,111.08 97.92,111.08C102.52,111.08 106.25,107.35 106.25,102.75V94.42ZM122.92,94.91V102.75C122.92,105.05 121.05,106.92 118.75,106.92C118.16,106.92 117.6,106.79 117.08,106.57L122.92,94.91ZM120.41,90.6L114.58,102.26V94.42C114.58,92.11 116.45,90.25 118.75,90.25C119.34,90.25 119.9,90.37 120.41,90.6ZM118.75,86.08C123.35,86.08 127.08,89.81 127.08,94.42V102.75C127.08,107.35 123.35,111.08 118.75,111.08C114.15,111.08 110.42,107.35 110.42,102.75V94.42C110.42,89.81 114.15,86.08 118.75,86.08ZM143.75,102.75V94.91L137.92,106.57C138.43,106.79 138.99,106.92 139.58,106.92C141.88,106.92 143.75,105.05 143.75,102.75ZM135.42,102.26L141.25,90.6C140.74,90.37 140.17,90.25 139.58,90.25C137.28,90.25 135.42,92.11 135.42,94.42V102.26ZM147.92,94.42C147.92,89.81 144.18,86.08 139.58,86.08C134.98,86.08 131.25,89.81 131.25,94.42V102.75C131.25,107.35 134.98,111.08 139.58,111.08C144.18,111.08 147.92,107.35 147.92,102.75V94.42ZM164.58,102.75V94.91L158.75,106.57C159.26,106.79 159.82,106.92 160.42,106.92C162.72,106.92 164.58,105.05 164.58,102.75ZM156.25,102.26L162.08,90.6C161.57,90.37 161.01,90.25 160.42,90.25C158.12,90.25 156.25,92.11 156.25,94.42V102.26ZM168.75,94.42C168.75,89.81 165.02,86.08 160.42,86.08C155.81,86.08 152.08,89.81 152.08,94.42V102.75C152.08,107.35 155.81,111.08 160.42,111.08C165.02,111.08 168.75,107.35 168.75,102.75V94.42Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M0,59C0,52.1 5.6,46.5 12.5,46.5H72.92C79.82,46.5 85.42,52.1 85.42,59V179.83C85.42,186.74 79.82,192.33 72.92,192.33H12.5C5.6,192.33 0,186.74 0,179.83V59Z"
+      android:fillColor="#AAC3EF"/>
+  <path
+      android:pathData="M72.92,50.67H12.5C7.9,50.67 4.17,54.4 4.17,59V179.83C4.17,184.43 7.9,188.17 12.5,188.17H72.92C77.52,188.17 81.25,184.43 81.25,179.83V59C81.25,54.4 77.52,50.67 72.92,50.67ZM12.5,46.5C5.6,46.5 0,52.1 0,59V179.83C0,186.74 5.6,192.33 12.5,192.33H72.92C79.82,192.33 85.42,186.74 85.42,179.83V59C85.42,52.1 79.82,46.5 72.92,46.5H12.5Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,85.04C16.67,86.77 15.27,88.17 13.54,88.17C11.82,88.17 10.42,86.77 10.42,85.04C10.42,83.32 11.82,81.92 13.54,81.92C15.27,81.92 16.67,83.32 16.67,85.04ZM25,85.04C25,86.77 23.6,88.17 21.87,88.17C20.15,88.17 18.75,86.77 18.75,85.04C18.75,83.32 20.15,81.92 21.87,81.92C23.6,81.92 25,83.32 25,85.04ZM30.21,88.17C31.93,88.17 33.33,86.77 33.33,85.04C33.33,83.32 31.93,81.92 30.21,81.92C28.48,81.92 27.08,83.32 27.08,85.04C27.08,86.77 28.48,88.17 30.21,88.17ZM59.37,88.17C61.1,88.17 62.5,86.77 62.5,85.04C62.5,83.32 61.1,81.92 59.37,81.92C57.65,81.92 56.25,83.32 56.25,85.04C56.25,86.77 57.65,88.17 59.37,88.17ZM51.04,88.17C52.77,88.17 54.17,86.77 54.17,85.04C54.17,83.32 52.77,81.92 51.04,81.92C49.32,81.92 47.92,83.32 47.92,85.04C47.92,86.77 49.32,88.17 51.04,88.17ZM42.71,88.17C44.43,88.17 45.83,86.77 45.83,85.04C45.83,83.32 44.43,81.92 42.71,81.92C40.98,81.92 39.58,83.32 39.58,85.04C39.58,86.77 40.98,88.17 42.71,88.17Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,85.04C16.67,86.77 15.27,88.17 13.54,88.17C11.82,88.17 10.42,86.77 10.42,85.04C10.42,83.32 11.82,81.92 13.54,81.92C15.27,81.92 16.67,83.32 16.67,85.04ZM25,85.04C25,86.77 23.6,88.17 21.87,88.17C20.15,88.17 18.75,86.77 18.75,85.04C18.75,83.32 20.15,81.92 21.87,81.92C23.6,81.92 25,83.32 25,85.04ZM30.21,88.17C31.93,88.17 33.33,86.77 33.33,85.04C33.33,83.32 31.93,81.92 30.21,81.92C28.48,81.92 27.08,83.32 27.08,85.04C27.08,86.77 28.48,88.17 30.21,88.17ZM59.37,88.17C61.1,88.17 62.5,86.77 62.5,85.04C62.5,83.32 61.1,81.92 59.37,81.92C57.65,81.92 56.25,83.32 56.25,85.04C56.25,86.77 57.65,88.17 59.37,88.17ZM51.04,88.17C52.77,88.17 54.17,86.77 54.17,85.04C54.17,83.32 52.77,81.92 51.04,81.92C49.32,81.92 47.92,83.32 47.92,85.04C47.92,86.77 49.32,88.17 51.04,88.17ZM42.71,88.17C44.43,88.17 45.83,86.77 45.83,85.04C45.83,83.32 44.43,81.92 42.71,81.92C40.98,81.92 39.58,83.32 39.58,85.04C39.58,86.77 40.98,88.17 42.71,88.17Z"
+      android:fillColor="#79A1E9"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,107.96C16.67,109.68 15.27,111.08 13.54,111.08C11.82,111.08 10.42,109.68 10.42,107.96C10.42,106.23 11.82,104.83 13.54,104.83C15.27,104.83 16.67,106.23 16.67,107.96ZM25,107.96C25,109.68 23.6,111.08 21.87,111.08C20.15,111.08 18.75,109.68 18.75,107.96C18.75,106.23 20.15,104.83 21.87,104.83C23.6,104.83 25,106.23 25,107.96ZM30.21,111.08C31.93,111.08 33.33,109.68 33.33,107.96C33.33,106.23 31.93,104.83 30.21,104.83C28.48,104.83 27.08,106.23 27.08,107.96C27.08,109.68 28.48,111.08 30.21,111.08ZM59.37,111.08C61.1,111.08 62.5,109.68 62.5,107.96C62.5,106.23 61.1,104.83 59.37,104.83C57.65,104.83 56.25,106.23 56.25,107.96C56.25,109.68 57.65,111.08 59.37,111.08ZM51.04,111.08C52.77,111.08 54.17,109.68 54.17,107.96C54.17,106.23 52.77,104.83 51.04,104.83C49.32,104.83 47.92,106.23 47.92,107.96C47.92,109.68 49.32,111.08 51.04,111.08ZM42.71,111.08C44.43,111.08 45.83,109.68 45.83,107.96C45.83,106.23 44.43,104.83 42.71,104.83C40.98,104.83 39.58,106.23 39.58,107.96C39.58,109.68 40.98,111.08 42.71,111.08Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,107.96C16.67,109.68 15.27,111.08 13.54,111.08C11.82,111.08 10.42,109.68 10.42,107.96C10.42,106.23 11.82,104.83 13.54,104.83C15.27,104.83 16.67,106.23 16.67,107.96ZM25,107.96C25,109.68 23.6,111.08 21.87,111.08C20.15,111.08 18.75,109.68 18.75,107.96C18.75,106.23 20.15,104.83 21.87,104.83C23.6,104.83 25,106.23 25,107.96ZM30.21,111.08C31.93,111.08 33.33,109.68 33.33,107.96C33.33,106.23 31.93,104.83 30.21,104.83C28.48,104.83 27.08,106.23 27.08,107.96C27.08,109.68 28.48,111.08 30.21,111.08ZM59.37,111.08C61.1,111.08 62.5,109.68 62.5,107.96C62.5,106.23 61.1,104.83 59.37,104.83C57.65,104.83 56.25,106.23 56.25,107.96C56.25,109.68 57.65,111.08 59.37,111.08ZM51.04,111.08C52.77,111.08 54.17,109.68 54.17,107.96C54.17,106.23 52.77,104.83 51.04,104.83C49.32,104.83 47.92,106.23 47.92,107.96C47.92,109.68 49.32,111.08 51.04,111.08ZM42.71,111.08C44.43,111.08 45.83,109.68 45.83,107.96C45.83,106.23 44.43,104.83 42.71,104.83C40.98,104.83 39.58,106.23 39.58,107.96C39.58,109.68 40.98,111.08 42.71,111.08Z"
+      android:fillColor="#79A1E9"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M33.33,59C33.33,57.85 34.27,56.92 35.42,56.92H50C51.15,56.92 52.08,57.85 52.08,59C52.08,60.15 51.15,61.08 50,61.08H35.42C34.27,61.08 33.33,60.15 33.33,59Z"
+      android:fillColor="#175DDC"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M40.63,136.08C30.85,136.08 22.92,144.01 22.92,153.79C22.92,163.57 30.85,171.5 40.63,171.5C50.41,171.5 58.33,163.57 58.33,153.79C58.33,151.49 60.2,149.63 62.5,149.63C64.8,149.63 66.67,151.49 66.67,153.79C66.67,168.17 55.01,179.83 40.63,179.83C26.24,179.83 14.58,168.17 14.58,153.79C14.58,139.41 26.24,127.75 40.63,127.75C42.93,127.75 44.79,129.62 44.79,131.92C44.79,134.22 42.93,136.08 40.63,136.08Z"
+      android:fillColor="#79A1E9"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/drawable/img_authenticator.xml b/app/src/main/res/drawable/img_authenticator.xml
new file mode 100644
index 0000000000..18174ceadf
--- /dev/null
+++ b/app/src/main/res/drawable/img_authenticator.xml
@@ -0,0 +1,73 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="200"
+    android:viewportHeight="200">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M-1498,-2559.83L243,-2559.83A4.5,4.5 0,0 1,247.5 -2555.33L247.5,1184.67A4.5,4.5 0,0 1,243 1189.17L-1498,1189.17A4.5,4.5 0,0 1,-1502.5 1184.67L-1502.5,-2555.33A4.5,4.5 0,0 1,-1498 -2559.83z"
+      android:fillColor="#00000000"
+      android:strokeColor="#9747FF"/>
+  <path
+      android:pathData="M33.33,38.17C33.33,31.26 38.93,25.67 45.83,25.67H187.5C194.4,25.67 200,31.26 200,38.17V138.17C200,145.07 194.4,150.67 187.5,150.67H45.83C38.93,150.67 33.33,145.07 33.33,138.17V38.17Z"
+      android:fillColor="#AAC3EF"/>
+  <path
+      android:pathData="M187.5,29.83H45.83C41.23,29.83 37.5,33.56 37.5,38.17V138.17C37.5,142.77 41.23,146.5 45.83,146.5H187.5C192.1,146.5 195.83,142.77 195.83,138.17V38.17C195.83,33.56 192.1,29.83 187.5,29.83ZM45.83,25.67C38.93,25.67 33.33,31.26 33.33,38.17V138.17C33.33,145.07 38.93,150.67 45.83,150.67H187.5C194.4,150.67 200,145.07 200,138.17V38.17C200,31.26 194.4,25.67 187.5,25.67H45.83Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M197.92,50.67L35.42,50.67L35.42,46.5L197.92,46.5L197.92,50.67Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M191.67,38.17C191.67,40.47 189.8,42.33 187.5,42.33C185.2,42.33 183.33,40.47 183.33,38.17C183.33,35.87 185.2,34 187.5,34C189.8,34 191.67,35.87 191.67,38.17Z"
+      android:fillColor="#020F66"/>
+  <path
+      android:pathData="M179.17,38.17C179.17,40.47 177.3,42.33 175,42.33C172.7,42.33 170.83,40.47 170.83,38.17C170.83,35.87 172.7,34 175,34C177.3,34 179.17,35.87 179.17,38.17Z"
+      android:fillColor="#020F66"/>
+  <path
+      android:pathData="M166.67,38.17C166.67,40.47 164.8,42.33 162.5,42.33C160.2,42.33 158.33,40.47 158.33,38.17C158.33,35.87 160.2,34 162.5,34C164.8,34 166.67,35.87 166.67,38.17Z"
+      android:fillColor="#020F66"/>
+  <path
+      android:pathData="M37.5,94.42C37.5,85.21 44.96,77.75 54.17,77.75H162.5C171.71,77.75 179.17,85.21 179.17,94.42V102.75C179.17,111.95 171.71,119.42 162.5,119.42H54.17C44.96,119.42 37.5,111.95 37.5,102.75V94.42Z"
+      android:fillColor="#FFBF00"/>
+  <path
+      android:pathData="M162.5,81.92H54.17C47.26,81.92 41.67,87.51 41.67,94.42V102.75C41.67,109.65 47.26,115.25 54.17,115.25H162.5C169.4,115.25 175,109.65 175,102.75V94.42C175,87.51 169.4,81.92 162.5,81.92ZM54.17,77.75C44.96,77.75 37.5,85.21 37.5,94.42V102.75C37.5,111.95 44.96,119.42 54.17,119.42H162.5C171.71,119.42 179.17,111.95 179.17,102.75V94.42C179.17,85.21 171.71,77.75 162.5,77.75H54.17Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M60.42,102.75L60.42,94.91L54.59,106.57C55.1,106.79 55.66,106.92 56.25,106.92C58.55,106.92 60.42,105.05 60.42,102.75ZM52.08,102.26L57.91,90.6C57.4,90.37 56.84,90.25 56.25,90.25C53.95,90.25 52.08,92.11 52.08,94.42V102.26ZM64.58,94.42C64.58,89.81 60.85,86.08 56.25,86.08C51.65,86.08 47.92,89.81 47.92,94.42V102.75C47.92,107.35 51.65,111.08 56.25,111.08C60.85,111.08 64.58,107.35 64.58,102.75L64.58,94.42ZM81.25,94.91V102.75C81.25,105.05 79.38,106.92 77.08,106.92C76.49,106.92 75.93,106.79 75.42,106.57L81.25,94.91ZM78.75,90.6L72.92,102.26V94.42C72.92,92.11 74.78,90.25 77.08,90.25C77.68,90.25 78.24,90.37 78.75,90.6ZM77.08,86.08C81.69,86.08 85.42,89.81 85.42,94.42V102.75C85.42,107.35 81.69,111.08 77.08,111.08C72.48,111.08 68.75,107.35 68.75,102.75V94.42C68.75,89.81 72.48,86.08 77.08,86.08ZM102.08,102.75V94.91L96.25,106.57C96.76,106.79 97.33,106.92 97.92,106.92C100.22,106.92 102.08,105.05 102.08,102.75ZM93.75,102.26L99.58,90.6C99.07,90.37 98.51,90.25 97.92,90.25C95.62,90.25 93.75,92.11 93.75,94.42V102.26ZM106.25,94.42C106.25,89.81 102.52,86.08 97.92,86.08C93.31,86.08 89.58,89.81 89.58,94.42V102.75C89.58,107.35 93.31,111.08 97.92,111.08C102.52,111.08 106.25,107.35 106.25,102.75V94.42ZM122.92,94.91V102.75C122.92,105.05 121.05,106.92 118.75,106.92C118.16,106.92 117.6,106.79 117.09,106.57L122.92,94.91ZM120.42,90.6L114.58,102.26V94.42C114.58,92.11 116.45,90.25 118.75,90.25C119.34,90.25 119.9,90.37 120.42,90.6ZM118.75,86.08C123.35,86.08 127.08,89.81 127.08,94.42V102.75C127.08,107.35 123.35,111.08 118.75,111.08C114.15,111.08 110.42,107.35 110.42,102.75V94.42C110.42,89.81 114.15,86.08 118.75,86.08ZM143.75,102.75V94.91L137.92,106.57C138.43,106.79 138.99,106.92 139.58,106.92C141.88,106.92 143.75,105.05 143.75,102.75ZM135.42,102.26L141.25,90.6C140.74,90.37 140.18,90.25 139.58,90.25C137.28,90.25 135.42,92.11 135.42,94.42V102.26ZM147.92,94.42C147.92,89.81 144.19,86.08 139.58,86.08C134.98,86.08 131.25,89.81 131.25,94.42V102.75C131.25,107.35 134.98,111.08 139.58,111.08C144.19,111.08 147.92,107.35 147.92,102.75V94.42ZM164.58,102.75V94.91L158.75,106.57C159.26,106.79 159.82,106.92 160.42,106.92C162.72,106.92 164.58,105.05 164.58,102.75ZM156.25,102.26L162.08,90.6C161.57,90.37 161.01,90.25 160.42,90.25C158.12,90.25 156.25,92.11 156.25,94.42V102.26ZM168.75,94.42C168.75,89.81 165.02,86.08 160.42,86.08C155.82,86.08 152.08,89.81 152.08,94.42V102.75C152.08,107.35 155.82,111.08 160.42,111.08C165.02,111.08 168.75,107.35 168.75,102.75V94.42Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M0,59C0,52.1 5.6,46.5 12.5,46.5H72.92C79.82,46.5 85.42,52.1 85.42,59V179.83C85.42,186.74 79.82,192.33 72.92,192.33H12.5C5.6,192.33 0,186.74 0,179.83V59Z"
+      android:fillColor="#DBE5F6"/>
+  <path
+      android:pathData="M72.92,50.67H12.5C7.9,50.67 4.17,54.4 4.17,59V179.83C4.17,184.43 7.9,188.17 12.5,188.17H72.92C77.52,188.17 81.25,184.43 81.25,179.83V59C81.25,54.4 77.52,50.67 72.92,50.67ZM12.5,46.5C5.6,46.5 0,52.1 0,59V179.83C0,186.74 5.6,192.33 12.5,192.33H72.92C79.82,192.33 85.42,186.74 85.42,179.83V59C85.42,52.1 79.82,46.5 72.92,46.5H12.5Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,85.04C16.67,86.77 15.27,88.17 13.54,88.17C11.82,88.17 10.42,86.77 10.42,85.04C10.42,83.32 11.82,81.92 13.54,81.92C15.27,81.92 16.67,83.32 16.67,85.04ZM25,85.04C25,86.77 23.6,88.17 21.88,88.17C20.15,88.17 18.75,86.77 18.75,85.04C18.75,83.32 20.15,81.92 21.88,81.92C23.6,81.92 25,83.32 25,85.04ZM30.21,88.17C31.93,88.17 33.33,86.77 33.33,85.04C33.33,83.32 31.93,81.92 30.21,81.92C28.48,81.92 27.08,83.32 27.08,85.04C27.08,86.77 28.48,88.17 30.21,88.17ZM59.38,88.17C61.1,88.17 62.5,86.77 62.5,85.04C62.5,83.32 61.1,81.92 59.38,81.92C57.65,81.92 56.25,83.32 56.25,85.04C56.25,86.77 57.65,88.17 59.38,88.17ZM51.04,88.17C52.77,88.17 54.17,86.77 54.17,85.04C54.17,83.32 52.77,81.92 51.04,81.92C49.32,81.92 47.92,83.32 47.92,85.04C47.92,86.77 49.32,88.17 51.04,88.17ZM42.71,88.17C44.43,88.17 45.83,86.77 45.83,85.04C45.83,83.32 44.43,81.92 42.71,81.92C40.98,81.92 39.58,83.32 39.58,85.04C39.58,86.77 40.98,88.17 42.71,88.17Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,85.04C16.67,86.77 15.27,88.17 13.54,88.17C11.82,88.17 10.42,86.77 10.42,85.04C10.42,83.32 11.82,81.92 13.54,81.92C15.27,81.92 16.67,83.32 16.67,85.04ZM25,85.04C25,86.77 23.6,88.17 21.88,88.17C20.15,88.17 18.75,86.77 18.75,85.04C18.75,83.32 20.15,81.92 21.88,81.92C23.6,81.92 25,83.32 25,85.04ZM30.21,88.17C31.93,88.17 33.33,86.77 33.33,85.04C33.33,83.32 31.93,81.92 30.21,81.92C28.48,81.92 27.08,83.32 27.08,85.04C27.08,86.77 28.48,88.17 30.21,88.17ZM59.38,88.17C61.1,88.17 62.5,86.77 62.5,85.04C62.5,83.32 61.1,81.92 59.38,81.92C57.65,81.92 56.25,83.32 56.25,85.04C56.25,86.77 57.65,88.17 59.38,88.17ZM51.04,88.17C52.77,88.17 54.17,86.77 54.17,85.04C54.17,83.32 52.77,81.92 51.04,81.92C49.32,81.92 47.92,83.32 47.92,85.04C47.92,86.77 49.32,88.17 51.04,88.17ZM42.71,88.17C44.43,88.17 45.83,86.77 45.83,85.04C45.83,83.32 44.43,81.92 42.71,81.92C40.98,81.92 39.58,83.32 39.58,85.04C39.58,86.77 40.98,88.17 42.71,88.17Z"
+      android:fillColor="#AAC3EF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,107.96C16.67,109.68 15.27,111.08 13.54,111.08C11.82,111.08 10.42,109.68 10.42,107.96C10.42,106.23 11.82,104.83 13.54,104.83C15.27,104.83 16.67,106.23 16.67,107.96ZM25,107.96C25,109.68 23.6,111.08 21.88,111.08C20.15,111.08 18.75,109.68 18.75,107.96C18.75,106.23 20.15,104.83 21.88,104.83C23.6,104.83 25,106.23 25,107.96ZM30.21,111.08C31.93,111.08 33.33,109.68 33.33,107.96C33.33,106.23 31.93,104.83 30.21,104.83C28.48,104.83 27.08,106.23 27.08,107.96C27.08,109.68 28.48,111.08 30.21,111.08ZM59.38,111.08C61.1,111.08 62.5,109.68 62.5,107.96C62.5,106.23 61.1,104.83 59.38,104.83C57.65,104.83 56.25,106.23 56.25,107.96C56.25,109.68 57.65,111.08 59.38,111.08ZM51.04,111.08C52.77,111.08 54.17,109.68 54.17,107.96C54.17,106.23 52.77,104.83 51.04,104.83C49.32,104.83 47.92,106.23 47.92,107.96C47.92,109.68 49.32,111.08 51.04,111.08ZM42.71,111.08C44.43,111.08 45.83,109.68 45.83,107.96C45.83,106.23 44.43,104.83 42.71,104.83C40.98,104.83 39.58,106.23 39.58,107.96C39.58,109.68 40.98,111.08 42.71,111.08Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16.67,107.96C16.67,109.68 15.27,111.08 13.54,111.08C11.82,111.08 10.42,109.68 10.42,107.96C10.42,106.23 11.82,104.83 13.54,104.83C15.27,104.83 16.67,106.23 16.67,107.96ZM25,107.96C25,109.68 23.6,111.08 21.88,111.08C20.15,111.08 18.75,109.68 18.75,107.96C18.75,106.23 20.15,104.83 21.88,104.83C23.6,104.83 25,106.23 25,107.96ZM30.21,111.08C31.93,111.08 33.33,109.68 33.33,107.96C33.33,106.23 31.93,104.83 30.21,104.83C28.48,104.83 27.08,106.23 27.08,107.96C27.08,109.68 28.48,111.08 30.21,111.08ZM59.38,111.08C61.1,111.08 62.5,109.68 62.5,107.96C62.5,106.23 61.1,104.83 59.38,104.83C57.65,104.83 56.25,106.23 56.25,107.96C56.25,109.68 57.65,111.08 59.38,111.08ZM51.04,111.08C52.77,111.08 54.17,109.68 54.17,107.96C54.17,106.23 52.77,104.83 51.04,104.83C49.32,104.83 47.92,106.23 47.92,107.96C47.92,109.68 49.32,111.08 51.04,111.08ZM42.71,111.08C44.43,111.08 45.83,109.68 45.83,107.96C45.83,106.23 44.43,104.83 42.71,104.83C40.98,104.83 39.58,106.23 39.58,107.96C39.58,109.68 40.98,111.08 42.71,111.08Z"
+      android:fillColor="#AAC3EF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M33.33,59C33.33,57.85 34.27,56.92 35.42,56.92H50C51.15,56.92 52.08,57.85 52.08,59C52.08,60.15 51.15,61.08 50,61.08H35.42C34.27,61.08 33.33,60.15 33.33,59Z"
+      android:fillColor="#020F66"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M40.62,136.08C30.84,136.08 22.92,144.01 22.92,153.79C22.92,163.57 30.84,171.5 40.62,171.5C50.4,171.5 58.33,163.57 58.33,153.79C58.33,151.49 60.2,149.63 62.5,149.63C64.8,149.63 66.67,151.49 66.67,153.79C66.67,168.17 55.01,179.83 40.62,179.83C26.24,179.83 14.58,168.17 14.58,153.79C14.58,139.41 26.24,127.75 40.62,127.75C42.93,127.75 44.79,129.62 44.79,131.92C44.79,134.22 42.93,136.08 40.62,136.08Z"
+      android:fillColor="#AAC3EF"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensionTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensionTest.kt
index ffe43b43b0..d7236a2575 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensionTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/util/TwoFactorAuthMethodExtensionTest.kt
@@ -135,7 +135,7 @@ class TwoFactorAuthMethodExtensionTest {
     @Test
     fun `imageRes returns the expected value`() {
         mapOf(
-            TwoFactorAuthMethod.AUTHENTICATOR_APP to null,
+            TwoFactorAuthMethod.AUTHENTICATOR_APP to R.drawable.img_authenticator,
             TwoFactorAuthMethod.EMAIL to R.drawable.img_new_device_verification,
             TwoFactorAuthMethod.DUO to null,
             TwoFactorAuthMethod.YUBI_KEY to R.drawable.yubi_key,