diff --git a/README.md b/README.md
index 6e7973d752..6c2066e59e 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 
 - [Compatibility](#compatibility)
 - [Setup](#setup)
+- [Theme](#theme)
 - [Dependencies](#dependencies)
 
 ## Compatibility
@@ -15,7 +16,6 @@
 
 ## Setup
 
-
 1. Clone the repository:
 
     ```sh
@@ -52,6 +52,25 @@
 
     Please avoid mixing formatting and logical changes in the same commit/PR. When possible, fix any large formatting issues in a separate PR before opening one to make logical changes to the same code. This helps others focus on the meaningful code changes when reviewing the code.
 
+## Theme
+
+### Icons & Illustrations
+
+The app supports light mode, dark mode and dynamic colors. Most icons in the app will display correctly using tinting but multi-tonal icons and illustrations require extra processing in order to be displayed properly with dynamic colors.
+
+All illustrations and multi-tonal icons require the svg paths to be tagged with the `name` attribute in order for each individual path to be tinted the appropriate color. Any untagged path will not be tinted and the resulting image will be incorrect.
+
+The supported tags are as follows:
+
+* outline
+* primary
+* secondary
+* tertiary
+* accent
+* logo
+* navigation
+* navigationActiveAccent
+
 ## Dependencies
 
 ### Application Dependencies
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/util/RememberVectorPainter.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/util/RememberVectorPainter.kt
index be5a03e3d5..71262dc8f6 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/util/RememberVectorPainter.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/util/RememberVectorPainter.kt
@@ -2,10 +2,15 @@ package com.x8bit.bitwarden.ui.platform.components.util
 
 import androidx.annotation.DrawableRes
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.graphics.vector.VectorGroup
 import androidx.compose.ui.graphics.vector.VectorPainter
+import androidx.compose.ui.graphics.vector.VectorPath
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.res.vectorResource
+import com.bitwarden.ui.platform.theme.color.BitwardenColorScheme
+import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme
 
 /**
  * Returns a [VectorPainter] built from the given [id] to circumvent issues with painter resources
@@ -15,5 +20,90 @@ import androidx.compose.ui.res.vectorResource
 fun rememberVectorPainter(
     @DrawableRes id: Int,
 ): VectorPainter = rememberVectorPainter(
-    image = ImageVector.vectorResource(id),
+    image = multiTonalVectorResource(id = id),
 )
+
+/**
+ * Creates a [ImageVector] and updates the path colors to match the current theme.
+ */
+@Composable
+private fun multiTonalVectorResource(
+    @DrawableRes id: Int,
+): ImageVector {
+    val originalImage = ImageVector.vectorResource(id = id)
+    return ImageVector
+        .Builder(
+            name = originalImage.name,
+            defaultWidth = originalImage.defaultWidth,
+            defaultHeight = originalImage.defaultHeight,
+            viewportWidth = originalImage.viewportWidth,
+            viewportHeight = originalImage.viewportHeight,
+            tintColor = originalImage.tintColor,
+            tintBlendMode = originalImage.tintBlendMode,
+            autoMirror = originalImage.autoMirror,
+        )
+        .cloneVectorGroupWithUpdatedColors(
+            vectorGroup = originalImage.root,
+            colors = BitwardenTheme.colorScheme,
+        )
+        .build()
+}
+
+/**
+ * Copies the given [vectorGroup] into the builder while updating the the path colors with the
+ * provided [colors].
+ */
+private fun ImageVector.Builder.cloneVectorGroupWithUpdatedColors(
+    vectorGroup: VectorGroup,
+    colors: BitwardenColorScheme,
+): ImageVector.Builder {
+    vectorGroup.iterator().forEach { vectorNode ->
+        when (vectorNode) {
+            is VectorGroup -> {
+                addGroup(
+                    name = vectorNode.name,
+                    rotate = vectorNode.rotation,
+                    pivotX = vectorNode.pivotX,
+                    pivotY = vectorNode.pivotY,
+                    scaleX = vectorNode.scaleX,
+                    scaleY = vectorNode.scaleY,
+                    translationX = vectorNode.translationX,
+                    translationY = vectorNode.translationY,
+                    clipPathData = vectorNode.clipPathData,
+                )
+                cloneVectorGroupWithUpdatedColors(vectorGroup = vectorNode, colors = colors)
+                clearGroup()
+            }
+
+            is VectorPath -> {
+                addPath(
+                    pathData = vectorNode.pathData,
+                    pathFillType = vectorNode.pathFillType,
+                    name = vectorNode.name,
+                    fill = when (vectorNode.name) {
+                        "outline" -> SolidColor(colors.illustration.outline)
+                        "primary" -> SolidColor(colors.illustration.backgroundPrimary)
+                        "secondary" -> SolidColor(colors.illustration.backgroundSecondary)
+                        "tertiary" -> SolidColor(colors.illustration.backgroundTertiary)
+                        "accent" -> SolidColor(colors.illustration.accent)
+                        "logo" -> SolidColor(colors.illustration.logo)
+                        "navigation" -> SolidColor(colors.icon.secondary)
+                        "navigationActiveAccent" -> SolidColor(colors.icon.navActiveAccent)
+                        else -> vectorNode.fill
+                    },
+                    fillAlpha = vectorNode.fillAlpha,
+                    stroke = vectorNode.stroke,
+                    strokeAlpha = vectorNode.strokeAlpha,
+                    strokeLineWidth = vectorNode.strokeLineWidth,
+                    strokeLineCap = vectorNode.strokeLineCap,
+                    strokeLineJoin = vectorNode.strokeLineJoin,
+                    strokeLineMiter = vectorNode.strokeLineMiter,
+                    trimPathStart = vectorNode.trimPathStart,
+                    trimPathEnd = vectorNode.trimPathEnd,
+                    trimPathOffset = vectorNode.trimPathOffset,
+                )
+            }
+        }
+    }
+    return this
+}
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt
index 3075ec5413..3749edbfc8 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/theme/color/ColorScheme.kt
@@ -35,6 +35,7 @@ val darkBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme(
         reversed = PrimitiveColors.gray1100,
         badgeBackground = PrimitiveColors.pink200,
         badgeForeground = PrimitiveColors.gray1100,
+        navActiveAccent = PrimitiveColors.blue500,
     ),
     filledButton = BitwardenColorScheme.FilledButtonColors(
         background = PrimitiveColors.blue400,
@@ -73,6 +74,10 @@ val darkBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme(
     illustration = BitwardenColorScheme.IllustrationColors(
         outline = PrimitiveColors.blue500,
         backgroundPrimary = PrimitiveColors.blue200,
+        backgroundSecondary = PrimitiveColors.blue300,
+        backgroundTertiary = PrimitiveColors.gray200,
+        accent = PrimitiveColors.yellow200,
+        logo = PrimitiveColors.gray100,
     ),
 )
 
@@ -107,6 +112,7 @@ val lightBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme(
         reversed = PrimitiveColors.gray100,
         badgeBackground = PrimitiveColors.pink100,
         badgeForeground = PrimitiveColors.gray100,
+        navActiveAccent = PrimitiveColors.blue100,
     ),
     filledButton = BitwardenColorScheme.FilledButtonColors(
         background = PrimitiveColors.blue500,
@@ -145,6 +151,10 @@ val lightBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme(
     illustration = BitwardenColorScheme.IllustrationColors(
         outline = PrimitiveColors.blue700,
         backgroundPrimary = PrimitiveColors.blue100,
+        backgroundSecondary = PrimitiveColors.blue200,
+        backgroundTertiary = PrimitiveColors.gray100,
+        accent = PrimitiveColors.yellow200,
+        logo = PrimitiveColors.blue500,
     ),
 )
 
@@ -185,6 +195,7 @@ fun dynamicBitwardenColorScheme(
             reversed = materialColorScheme.inversePrimary,
             badgeBackground = materialColorScheme.error,
             badgeForeground = materialColorScheme.onError,
+            navActiveAccent = materialColorScheme.onPrimary,
         ),
         filledButton = BitwardenColorScheme.FilledButtonColors(
             background = materialColorScheme.primary,
@@ -221,8 +232,20 @@ fun dynamicBitwardenColorScheme(
             error = defaultTheme.status.error,
         ),
         illustration = BitwardenColorScheme.IllustrationColors(
-            outline = materialColorScheme.tertiaryContainer,
-            backgroundPrimary = materialColorScheme.onTertiaryContainer,
+            outline = materialColorScheme.onSurface,
+            backgroundPrimary = if (isDarkTheme) {
+                materialColorScheme.outlineVariant
+            } else {
+                materialColorScheme.surfaceContainerHighest
+            },
+            backgroundSecondary = if (isDarkTheme) {
+                materialColorScheme.surfaceContainerHighest
+            } else {
+                materialColorScheme.outlineVariant
+            },
+            backgroundTertiary = materialColorScheme.surface,
+            accent = materialColorScheme.tertiaryContainer,
+            logo = materialColorScheme.primary,
         ),
     )
 }
diff --git a/app/src/main/res/drawable-night/account_setup.xml b/app/src/main/res/drawable-night/account_setup.xml
deleted file mode 100644
index 12c522878c..0000000000
--- a/app/src/main/res/drawable-night/account_setup.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M8.33,21.5C8.33,14.6 13.93,9 20.83,9H87.5C94.4,9 100,14.6 100,21.5V163.17C100,170.07 94.4,175.67 87.5,175.67H20.83C13.93,175.67 8.33,170.07 8.33,163.17V21.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M87.5,13.17H20.83C16.23,13.17 12.5,16.9 12.5,21.5V163.17C12.5,167.77 16.23,171.5 20.83,171.5H87.5C92.1,171.5 95.83,167.77 95.83,163.17V21.5C95.83,16.9 92.1,13.17 87.5,13.17ZM20.83,9C13.93,9 8.33,14.6 8.33,21.5V163.17C8.33,170.07 13.93,175.67 20.83,175.67H87.5C94.4,175.67 100,170.07 100,163.17V21.5C100,14.6 94.4,9 87.5,9H20.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M45.83,23.58C45.83,22.43 46.77,21.5 47.92,21.5H60.42C61.57,21.5 62.5,22.43 62.5,23.58C62.5,24.73 61.57,25.67 60.42,25.67H47.92C46.77,25.67 45.83,24.73 45.83,23.58Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M91.67,96.5C91.67,121.81 74.88,142.33 54.17,142.33C33.46,142.33 16.67,121.81 16.67,96.5C16.67,71.19 33.46,50.67 54.17,50.67C74.88,50.67 91.67,71.19 91.67,96.5Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M54.17,138.17C71.83,138.17 87.5,120.33 87.5,96.5C87.5,72.67 71.83,54.83 54.17,54.83C36.5,54.83 20.83,72.67 20.83,96.5C20.83,120.33 36.5,138.17 54.17,138.17ZM54.17,142.33C74.88,142.33 91.67,121.81 91.67,96.5C91.67,71.19 74.88,50.67 54.17,50.67C33.46,50.67 16.67,71.19 16.67,96.5C16.67,121.81 33.46,142.33 54.17,142.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M170.83,88.17C170.83,104.28 157.77,117.33 141.67,117.33C125.56,117.33 112.5,104.28 112.5,88.17C112.5,72.06 125.56,59 141.67,59C157.77,59 170.83,72.06 170.83,88.17Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M141.67,113.17C155.47,113.17 166.67,101.97 166.67,88.17C166.67,74.36 155.47,63.17 141.67,63.17C127.86,63.17 116.67,74.36 116.67,88.17C116.67,101.97 127.86,113.17 141.67,113.17ZM141.67,117.33C157.77,117.33 170.83,104.28 170.83,88.17C170.83,72.06 157.77,59 141.67,59C125.56,59 112.5,72.06 112.5,88.17C112.5,104.28 125.56,117.33 141.67,117.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M195.64,150.62C197.58,155.31 198.89,160.23 199.53,165.25H104.17V144.42H92.79C95.35,139.89 98.51,135.72 102.2,132.03C107.52,126.71 113.83,122.49 120.78,119.61C127.73,116.73 135.18,115.25 142.71,115.25C150.23,115.25 157.68,116.73 164.63,119.61C171.58,122.49 177.9,126.71 183.22,132.03C188.54,137.35 192.76,143.67 195.64,150.62Z"
-      android:fillColor="#F3F6F9"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M108.33,140.25V161.08H194.58C193.91,158.06 192.98,155.09 191.79,152.21C189.12,145.77 185.21,139.91 180.27,134.98C175.34,130.04 169.48,126.13 163.04,123.46C156.59,120.79 149.68,119.42 142.71,119.42C135.73,119.42 128.82,120.79 122.38,123.46C115.93,126.13 110.08,130.04 105.14,134.98C103.49,136.63 101.94,138.4 100.52,140.25H108.33ZM95.38,140.25C94.46,141.6 93.6,142.99 92.79,144.42H104.17V165.25H199.53C199.35,163.85 199.12,162.46 198.84,161.08C198.11,157.51 197.04,154 195.64,150.62C192.76,143.67 188.54,137.35 183.22,132.03C177.9,126.71 171.58,122.49 164.63,119.61C157.68,116.73 150.23,115.25 142.71,115.25C135.18,115.25 127.73,116.73 120.78,119.61C113.83,122.49 107.52,126.71 102.2,132.03C99.67,134.56 97.39,137.31 95.38,140.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M97.92,198.58C111.1,198.58 122.49,190.93 127.9,179.83H142.02C143.13,179.83 144.19,179.39 144.97,178.61L150,173.58L154.78,178.36C155.59,179.17 156.91,179.17 157.72,178.36L159.38,176.71L161.03,178.36C161.84,179.17 163.16,179.17 163.97,178.36L168.75,173.58L173.78,178.61C174.56,179.39 175.62,179.83 176.73,179.83H183.69C184.8,179.83 185.86,179.39 186.64,178.61L199.26,165.99C199.67,165.58 199.67,164.92 199.26,164.51L186.64,151.89C185.86,151.1 184.8,150.67 183.69,150.67H127.9C122.49,139.57 111.1,131.92 97.92,131.92C79.51,131.92 64.58,146.84 64.58,165.25C64.58,183.66 79.51,198.58 97.92,198.58ZM85.42,171.5C88.87,171.5 91.67,168.7 91.67,165.25C91.67,161.8 88.87,159 85.42,159C81.97,159 79.17,161.8 79.17,165.25C79.17,168.7 81.97,171.5 85.42,171.5Z"
-      android:fillColor="#79A1E9"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125.29,175.67H142.02L150,167.69L156.25,173.94L159.38,170.82L162.5,173.94L168.75,167.69L176.73,175.67H183.69L194.11,165.25L183.69,154.83L125.29,154.83L124.15,152.49C119.42,142.77 109.44,136.08 97.92,136.08C81.81,136.08 68.75,149.14 68.75,165.25C68.75,181.36 81.81,194.42 97.92,194.42C109.44,194.42 119.42,187.73 124.15,178.01L125.29,175.67ZM199.26,165.99C199.67,165.58 199.67,164.92 199.26,164.51L186.64,151.89C185.86,151.1 184.8,150.67 183.69,150.67H127.9C122.49,139.57 111.1,131.92 97.92,131.92C79.51,131.92 64.58,146.84 64.58,165.25C64.58,183.66 79.51,198.58 97.92,198.58C111.1,198.58 122.49,190.93 127.9,179.83H142.02C143.13,179.83 144.19,179.39 144.97,178.61L150,173.58L154.78,178.36C155.59,179.17 156.91,179.17 157.72,178.36C157.72,178.36 157.72,178.36 157.72,178.36L159.38,176.71L161.03,178.36C161.03,178.36 161.03,178.36 161.03,178.36C161.84,179.17 163.16,179.17 163.97,178.36L168.75,173.58L173.78,178.61C174.56,179.39 175.62,179.83 176.73,179.83H183.69C184.8,179.83 185.86,179.39 186.64,178.61L199.26,165.99ZM95.83,165.25C95.83,171 91.17,175.67 85.42,175.67C79.66,175.67 75,171 75,165.25C75,159.5 79.66,154.83 85.42,154.83C91.17,154.83 95.83,159.5 95.83,165.25ZM91.67,165.25C91.67,168.7 88.87,171.5 85.42,171.5C81.97,171.5 79.17,168.7 79.17,165.25C79.17,161.8 81.97,159 85.42,159C88.87,159 91.67,161.8 91.67,165.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M40.32,71.91C44.63,70.3 49.29,69.42 54.17,69.42C59.05,69.42 63.71,70.3 68.02,71.91C69.1,72.31 70.3,71.76 70.7,70.69C71.11,69.61 70.56,68.41 69.48,68.01C64.71,66.22 59.55,65.25 54.17,65.25C48.79,65.25 43.63,66.22 38.86,68.01C37.78,68.41 37.23,69.61 37.64,70.69C38.04,71.76 39.24,72.31 40.32,71.91ZM54.17,77.75C44.63,77.75 36.16,82.33 30.83,89.42C30.14,90.34 28.84,90.52 27.92,89.83C27,89.14 26.81,87.84 27.5,86.92C33.58,78.82 43.26,73.58 54.17,73.58C65,73.58 74.04,78.01 80.64,84.61C81.46,85.42 81.46,86.74 80.65,87.56C79.83,88.37 78.51,88.37 77.7,87.56C71.8,81.66 63.79,77.75 54.17,77.75ZM53.88,81.92C40.43,81.92 29.8,93.31 30.73,106.72L30.92,109.42C31.16,112.92 31.98,116.35 33.36,119.57L34.54,122.32C34.99,123.38 36.22,123.87 37.28,123.42C38.33,122.96 38.82,121.74 38.37,120.68L37.2,117.93C36,115.14 35.28,112.17 35.07,109.13L34.89,106.43C34.13,95.43 42.85,86.08 53.88,86.08C64.39,86.08 72.92,94.61 72.92,105.12V106.92C72.92,108.07 71.98,109 70.83,109C69.68,109 68.75,108.07 68.75,106.92V104.83C68.75,101.48 67.54,97.84 64.95,95.02C62.31,92.15 58.35,90.25 53.13,90.25C47.69,90.25 44.19,92.72 42.13,95.89C40.16,98.92 39.58,102.48 39.58,104.83C39.58,110.65 40.11,114.89 41.57,118.39C43.05,121.96 45.42,124.56 48.67,127.27C49.55,128 50.86,127.88 51.6,127C52.34,126.12 52.22,124.8 51.33,124.07C48.33,121.57 46.53,119.48 45.41,116.79C44.27,114.05 43.75,110.47 43.75,104.83C43.75,103.02 44.22,100.32 45.63,98.16C46.96,96.11 49.18,94.42 53.13,94.42C57.27,94.42 60.09,95.89 61.88,97.84C63.71,99.83 64.58,102.43 64.58,104.83V106.92C64.58,110.37 67.38,113.17 70.83,113.17C74.29,113.17 77.08,110.37 77.08,106.92V105.12C77.08,92.31 66.69,81.92 53.88,81.92ZM51.99,104.71C51.99,103.66 52.86,102.75 54.05,102.75C55.27,102.75 56.25,103.74 56.25,104.95V108.36C56.25,112.04 57.98,115.51 60.93,117.72L62.64,119C64.8,120.62 67.43,121.5 70.14,121.5H70.83C71.98,121.5 72.92,120.57 72.92,119.42C72.92,118.27 71.98,117.33 70.83,117.33H70.14C68.34,117.33 66.58,116.75 65.14,115.67L63.43,114.39C61.53,112.96 60.42,110.73 60.42,108.36V104.95C60.42,101.43 57.57,98.58 54.05,98.58C50.7,98.58 47.82,101.22 47.83,104.71C47.83,106.76 47.91,109.34 48.19,111.72C48.51,114.31 49.76,116.35 51.1,118.04C51.71,118.81 52.38,119.56 53,120.26L53.16,120.44C53.84,121.21 54.48,121.93 55.04,122.68C56.42,124.5 56.79,125.99 56.4,126.98C55.97,128.04 56.49,129.26 57.56,129.68C58.63,130.11 59.84,129.59 60.27,128.52C61.53,125.38 59.93,122.22 58.36,120.16C57.69,119.27 56.96,118.44 56.28,117.68L56.12,117.51C55.49,116.79 54.9,116.13 54.37,115.46C53.23,114.02 52.51,112.71 52.33,111.23C52.07,109.07 52,106.68 51.99,104.71Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/blocked_uri.xml b/app/src/main/res/drawable-night/blocked_uri.xml
deleted file mode 100644
index 01f9998f3f..0000000000
--- a/app/src/main/res/drawable-night/blocked_uri.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M200,100.67C200,155.9 155.23,200.67 100,200.67C44.77,200.67 0,155.9 0,100.67C0,45.44 44.77,0.67 100,0.67C155.23,0.67 200,45.44 200,100.67Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M100,196.5C152.93,196.5 195.83,153.59 195.83,100.67C195.83,47.74 152.93,4.83 100,4.83C47.07,4.83 4.17,47.74 4.17,100.67C4.17,153.59 47.07,196.5 100,196.5ZM100,200.67C155.23,200.67 200,155.9 200,100.67C200,45.44 155.23,0.67 100,0.67C44.77,0.67 0,45.44 0,100.67C0,155.9 44.77,200.67 100,200.67Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M84.28,1.89C105.41,17.95 120.99,40.92 127.66,67.43C155.17,68.51 180.27,78.94 199.88,95.64C199.96,97.31 200,98.98 200,100.67C200,100.88 200,101.09 200,101.3C180.96,83.98 156.07,72.99 128.64,71.64C130.35,79.66 131.25,87.97 131.25,96.5C131.25,123.36 122.33,148.13 107.3,168.02C116.3,170.29 125.71,171.5 135.42,171.5C150.43,171.5 164.77,168.61 177.91,163.36C176.1,165.61 174.19,167.78 172.19,169.86C160.61,173.63 148.25,175.67 135.42,175.67C124.72,175.67 114.35,174.25 104.49,171.6C96.17,181.78 86.19,190.55 74.97,197.51C73.12,197.03 71.3,196.51 69.49,195.93C81.15,189.23 91.51,180.55 100.13,170.34C71.25,161.36 47.1,141.67 32.33,115.91C24.2,126.39 17.84,138.32 13.72,151.26C12.77,149.63 11.86,147.98 10.99,146.3C15.46,133.74 21.98,122.15 30.15,111.94C21.54,95.49 16.67,76.77 16.67,56.92C16.67,52.69 16.89,48.51 17.32,44.4C18.94,42.03 20.66,39.72 22.47,37.5C21.39,43.81 20.83,50.3 20.83,56.92C20.83,75.45 25.23,92.96 33.05,108.46C54.82,83.27 87.01,67.33 122.92,67.33C123.06,67.33 123.2,67.33 123.34,67.33C116.41,40.95 100.32,18.29 78.67,2.95C80.52,2.54 82.39,2.19 84.28,1.89ZM127.08,96.5C127.08,87.92 126.14,79.55 124.35,71.51C123.87,71.5 123.39,71.5 122.92,71.5C87.68,71.5 56.17,87.4 35.15,112.42C49.59,138.45 73.86,158.26 102.96,166.84C118.08,147.42 127.08,123.01 127.08,96.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M139.58,67.33C139.58,74.24 133.99,79.83 127.08,79.83C120.18,79.83 114.58,74.24 114.58,67.33C114.58,60.43 120.18,54.83 127.08,54.83C133.99,54.83 139.58,60.43 139.58,67.33Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M127.08,75.67C131.69,75.67 135.42,71.94 135.42,67.33C135.42,62.73 131.69,59 127.08,59C122.48,59 118.75,62.73 118.75,67.33C118.75,71.94 122.48,75.67 127.08,75.67ZM127.08,79.83C133.99,79.83 139.58,74.24 139.58,67.33C139.58,60.43 133.99,54.83 127.08,54.83C120.18,54.83 114.58,60.43 114.58,67.33C114.58,74.24 120.18,79.83 127.08,79.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M116.67,167.33C116.67,174.24 111.07,179.83 104.17,179.83C97.26,179.83 91.67,174.24 91.67,167.33C91.67,160.43 97.26,154.83 104.17,154.83C111.07,154.83 116.67,160.43 116.67,167.33Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M104.17,175.67C108.77,175.67 112.5,171.94 112.5,167.33C112.5,162.73 108.77,159 104.17,159C99.56,159 95.83,162.73 95.83,167.33C95.83,171.94 99.56,175.67 104.17,175.67ZM104.17,179.83C111.07,179.83 116.67,174.24 116.67,167.33C116.67,160.43 111.07,154.83 104.17,154.83C97.26,154.83 91.67,160.43 91.67,167.33C91.67,174.24 97.26,179.83 104.17,179.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M45.83,109C45.83,115.9 40.24,121.5 33.33,121.5C26.43,121.5 20.83,115.9 20.83,109C20.83,102.1 26.43,96.5 33.33,96.5C40.24,96.5 45.83,102.1 45.83,109Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M33.33,117.33C37.94,117.33 41.67,113.6 41.67,109C41.67,104.4 37.94,100.67 33.33,100.67C28.73,100.67 25,104.4 25,109C25,113.6 28.73,117.33 33.33,117.33ZM33.33,121.5C40.24,121.5 45.83,115.9 45.83,109C45.83,102.1 40.24,96.5 33.33,96.5C26.43,96.5 20.83,102.1 20.83,109C20.83,115.9 26.43,121.5 33.33,121.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_generator_filled.xml b/app/src/main/res/drawable-night/ic_generator_filled.xml
deleted file mode 100644
index ab741b18bf..0000000000
--- a/app/src/main/res/drawable-night/ic_generator_filled.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-    <group>
-        <clip-path android:pathData="M0,0.667h24v24h-24z" />
-        <path
-            android:fillColor="#175DDC"
-            android:pathData="M19,12.667C19,16.532 15.866,19.667 12,19.667C8.134,19.667 5,16.532 5,12.667C5,8.801 8.134,5.667 12,5.667C15.866,5.667 19,8.801 19,12.667Z" />
-        <path
-            android:fillColor="#65ABFF"
-            android:fillType="evenOdd"
-            android:pathData="M22.796,13.49C23.345,13.549 23.742,14.043 23.683,14.592C23.061,20.319 18.128,24.752 12.167,24.752C7.395,24.752 3.288,21.914 1.516,17.849C1.296,17.343 1.527,16.753 2.033,16.533C2.54,16.312 3.129,16.544 3.35,17.05C4.808,20.396 8.202,22.752 12.167,22.752C17.127,22.752 21.185,19.068 21.694,14.376C21.754,13.827 22.247,13.43 22.796,13.49Z" />
-        <path
-            android:fillColor="#65ABFF"
-            android:fillType="evenOdd"
-            android:pathData="M7.439,17.08C7.439,16.528 6.991,16.08 6.439,16.08H1.25C0.698,16.08 0.25,16.528 0.25,17.08V22.27C0.25,22.823 0.698,23.27 1.25,23.27C1.802,23.27 2.25,22.823 2.25,22.27V18.08H6.439C6.991,18.08 7.439,17.633 7.439,17.08Z" />
-        <path
-            android:fillColor="#65ABFF"
-            android:fillType="evenOdd"
-            android:pathData="M1.206,12.512C0.657,12.452 0.261,11.959 0.32,11.41C0.942,5.683 5.874,1.25 11.836,1.25C16.608,1.25 20.714,4.087 22.486,8.152C22.707,8.659 22.476,9.248 21.969,9.469C21.463,9.689 20.874,9.458 20.653,8.952C19.194,5.606 15.801,3.25 11.836,3.25C6.876,3.25 2.818,6.933 2.309,11.626C2.249,12.175 1.755,12.572 1.206,12.512Z" />
-        <path
-            android:fillColor="#65ABFF"
-            android:fillType="evenOdd"
-            android:pathData="M16.564,8.921C16.564,9.473 17.012,9.921 17.564,9.921H22.753C23.305,9.921 23.753,9.473 23.753,8.921V3.731C23.753,3.179 23.305,2.731 22.753,2.731C22.2,2.731 21.753,3.179 21.753,3.731V7.921H17.564C17.012,7.921 16.564,8.369 16.564,8.921Z" />
-        <path
-            android:fillColor="#65ABFF"
-            android:fillType="evenOdd"
-            android:pathData="M12.007,9C12.559,9 13.007,9.447 13.007,10V11.7L14.602,11.177C15.127,11.005 15.691,11.291 15.863,11.816C16.035,12.341 15.749,12.906 15.224,13.078L13.611,13.606L14.62,15.018C14.941,15.467 14.836,16.092 14.387,16.413C13.937,16.734 13.313,16.63 12.992,16.18L12.007,14.8L11.021,16.18C10.7,16.63 10.076,16.734 9.626,16.413C9.177,16.092 9.073,15.468 9.394,15.018L10.402,13.606L8.789,13.078C8.264,12.906 7.978,12.341 8.15,11.816C8.322,11.291 8.886,11.005 9.411,11.177L11.007,11.7V10C11.007,9.447 11.454,9 12.007,9Z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_send_filled.xml b/app/src/main/res/drawable-night/ic_send_filled.xml
deleted file mode 100644
index d4723a5d2e..0000000000
--- a/app/src/main/res/drawable-night/ic_send_filled.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <group>
-    <clip-path
-        android:pathData="M0,0.667h24v24h-24z"/>
-    <path
-        android:pathData="M9,22.667V17.667L22,3.167L20,22.167L13,19.667L10,22.667H9Z"
-        android:fillColor="#175DDC"/>
-    <path
-        android:pathData="M23.555,4.043C23.885,2.35 22.06,1.061 20.574,1.938L2.278,12.75C0.835,13.602 1.017,15.744 2.583,16.34L7.999,18.406V22.482C7.999,23.412 8.754,24.167 9.684,24.167C10.176,24.167 10.644,23.952 10.964,23.578L13.379,20.76L17.445,22.57C18.62,23.092 19.975,22.387 20.222,21.125L23.555,4.043ZM11.472,19.912L9.999,19.256V21.63L11.472,19.912ZM18.258,20.743L10.675,17.368L15.737,11.842C16.11,11.435 16.082,10.802 15.675,10.429C15.268,10.056 14.635,10.084 14.262,10.491L8.721,16.54L3.295,14.472L21.592,3.66L18.258,20.743Z"
-        android:fillColor="#65ABFF"
-        android:fillType="evenOdd"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_settings_filled.xml b/app/src/main/res/drawable-night/ic_settings_filled.xml
deleted file mode 100644
index 60afa6271b..0000000000
--- a/app/src/main/res/drawable-night/ic_settings_filled.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <group>
-    <clip-path
-        android:pathData="M0,0.667h24v24h-24z"/>
-    <path
-        android:pathData="M20.36,4.306C20.74,4.272 21.117,4.458 21.315,4.802L23.468,8.531C23.712,8.954 23.615,9.492 23.237,9.803L21.851,10.944C21.949,11.503 21.999,12.079 21.999,12.666C21.999,13.254 21.949,13.829 21.851,14.389L23.237,15.53C23.615,15.84 23.712,16.378 23.468,16.802L21.315,20.531C21.071,20.954 20.556,21.139 20.098,20.967L18.416,20.337C17.537,21.073 16.53,21.66 15.434,22.061L15.139,23.831C15.058,24.313 14.641,24.666 14.152,24.666H9.846C9.358,24.666 8.94,24.313 8.86,23.831L8.565,22.061C7.468,21.66 6.462,21.073 5.583,20.337L3.9,20.967C3.814,20.999 3.726,21.019 3.639,21.027L9.878,14.788C10.421,15.331 11.171,15.666 11.999,15.666C13.656,15.666 14.999,14.323 14.999,12.666C14.999,11.838 14.663,11.088 14.121,10.545L20.36,4.306Z"
-        android:fillColor="#175DDC"/>
-    <path
-        android:pathData="M16.999,12.667C16.999,15.428 14.761,17.667 11.999,17.667C9.238,17.667 6.999,15.428 6.999,12.667C6.999,9.905 9.238,7.667 11.999,7.667C14.761,7.667 16.999,9.905 16.999,12.667ZM14.999,12.667C14.999,14.323 13.656,15.667 11.999,15.667C10.342,15.667 8.999,14.323 8.999,12.667C8.999,11.01 10.342,9.667 11.999,9.667C13.656,9.667 14.999,11.01 14.999,12.667Z"
-        android:fillColor="#65ABFF"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M15.434,3.272L15.139,1.502C15.058,1.02 14.641,0.667 14.152,0.667H9.846C9.358,0.667 8.94,1.02 8.86,1.502L8.565,3.272C7.468,3.673 6.462,4.26 5.583,4.996L3.9,4.366C3.442,4.194 2.928,4.379 2.683,4.802L0.531,8.531C0.286,8.954 0.384,9.492 0.761,9.803L2.147,10.944C2.05,11.504 1.999,12.079 1.999,12.667C1.999,13.254 2.05,13.829 2.147,14.389L0.761,15.53C0.384,15.841 0.286,16.379 0.531,16.802L2.683,20.531C2.928,20.954 3.442,21.139 3.9,20.967L5.583,20.337C6.462,21.073 7.468,21.66 8.565,22.061L8.86,23.831C8.94,24.313 9.358,24.667 9.846,24.667H14.152C14.641,24.667 15.058,24.313 15.139,23.831L15.434,22.061C16.53,21.66 17.537,21.073 18.416,20.337L20.098,20.967C20.556,21.139 21.071,20.954 21.315,20.531L23.468,16.802C23.712,16.379 23.615,15.841 23.237,15.53L21.851,14.389C21.949,13.829 21.999,13.254 21.999,12.667C21.999,12.079 21.949,11.504 21.851,10.944L23.237,9.803C23.615,9.492 23.712,8.954 23.468,8.531L21.315,4.802C21.071,4.379 20.556,4.194 20.098,4.366L18.416,4.996C17.537,4.26 16.53,3.673 15.434,3.272ZM13.652,4.75L13.305,2.667H10.693L10.346,4.75L9.252,5.15C8.376,5.47 7.571,5.94 6.867,6.529L5.973,7.278L3.992,6.536L2.686,8.797L4.317,10.14L4.118,11.286C4.04,11.733 3.999,12.194 3.999,12.667C3.999,13.139 4.04,13.6 4.118,14.047L4.317,15.193L2.686,16.536L3.992,18.797L5.973,18.055L6.867,18.804C7.571,19.393 8.376,19.863 9.252,20.183L10.346,20.583L10.693,22.667H13.305L13.652,20.583L14.747,20.183C15.622,19.863 16.428,19.393 17.132,18.804L18.025,18.055L20.007,18.797L21.312,16.536L19.682,15.193L19.881,14.047C19.959,13.6 19.999,13.139 19.999,12.667C19.999,12.194 19.959,11.733 19.881,11.286L19.682,10.14L21.312,8.797L20.007,6.536L18.025,7.278L17.132,6.529C16.428,5.94 15.622,5.47 14.747,5.15L13.652,4.75Z"
-        android:fillColor="#65ABFF"
-        android:fillType="evenOdd"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-night/ic_vault_filled.xml b/app/src/main/res/drawable-night/ic_vault_filled.xml
deleted file mode 100644
index 7b6d888f63..0000000000
--- a/app/src/main/res/drawable-night/ic_vault_filled.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-    <path
-        android:fillColor="#175DDC"
-        android:pathData="M2,19.667H22V5.667L10.823,13.491C10.529,14.141 9.897,14.605 9.151,14.661L2,19.667Z" />
-    <path
-        android:fillColor="#65ABFF"
-        android:fillType="evenOdd"
-        android:pathData="M9,6.667C9.552,6.667 10,7.114 10,7.667V8.793C10.715,8.977 11.352,9.353 11.854,9.864L12.83,9.3C13.308,9.024 13.92,9.188 14.196,9.667C14.472,10.145 14.308,10.756 13.83,11.033L12.855,11.595C12.95,11.936 13,12.295 13,12.667C13,13.038 12.95,13.397 12.855,13.738L13.83,14.3C14.308,14.577 14.472,15.188 14.196,15.667C13.92,16.145 13.308,16.309 12.83,16.032L11.854,15.469C11.352,15.98 10.715,16.357 10,16.541V17.667C10,18.219 9.552,18.667 9,18.667C8.448,18.667 8,18.219 8,17.667V16.541C7.285,16.357 6.647,15.98 6.146,15.469L5.17,16.032C4.692,16.309 4.08,16.145 3.804,15.667C3.528,15.188 3.692,14.577 4.17,14.3L5.145,13.738C5.05,13.397 5,13.038 5,12.667C5,12.295 5.05,11.936 5.145,11.595L4.17,11.033C3.692,10.756 3.528,10.145 3.804,9.667C4.08,9.188 4.692,9.024 5.17,9.3L6.146,9.864C6.647,9.353 7.285,8.977 8,8.793V7.667C8,7.114 8.448,6.667 9,6.667ZM11,12.667C11,13.023 10.907,13.358 10.743,13.648L10.732,13.667L10.722,13.684C10.374,14.272 9.733,14.667 9,14.667C8.267,14.667 7.627,14.273 7.278,13.685L7.268,13.667L7.257,13.647C7.093,13.358 7,13.023 7,12.667C7,12.31 7.093,11.976 7.257,11.686L7.268,11.667L7.278,11.648C7.627,11.061 8.267,10.667 9,10.667C9.733,10.667 10.374,11.061 10.722,11.649L10.732,11.667L10.743,11.685C10.907,11.975 11,12.31 11,12.667Z" />
-    <path
-        android:fillColor="#65ABFF"
-        android:fillType="evenOdd"
-        android:pathData="M3,22.667V21.667C1.343,21.667 0,20.323 0,18.667V6.667C0,5.01 1.343,3.667 3,3.667H21C22.657,3.667 24,5.01 24,6.667V18.667C24,20.323 22.657,21.667 21,21.667V22.667C21,23.219 20.552,23.667 20,23.667C19.448,23.667 19,23.219 19,22.667V21.667H5V22.667C5,23.219 4.552,23.667 4,23.667C3.448,23.667 3,23.219 3,22.667ZM21,5.667H3C2.448,5.667 2,6.114 2,6.667V18.667C2,19.219 2.448,19.667 3,19.667H21C21.552,19.667 22,19.219 22,18.667V16.667H20C19.448,16.667 19,16.219 19,15.667C19,15.114 19.448,14.667 20,14.667H22V10.667H20C19.448,10.667 19,10.219 19,9.667C19,9.114 19.448,8.667 20,8.667H22V6.667C22,6.114 21.552,5.667 21,5.667Z" />
-</vector>
diff --git a/app/src/main/res/drawable-night/il_secure_devices.xml b/app/src/main/res/drawable-night/il_secure_devices.xml
deleted file mode 100644
index 1e7bf98429..0000000000
--- a/app/src/main/res/drawable-night/il_secure_devices.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="96dp"
-    android:height="96dp"
-    android:viewportWidth="96"
-    android:viewportHeight="96">
-    <path
-        android:fillColor="#AAC3EF"
-        android:pathData="M9,18C9,14.686 11.686,12 15,12H81C84.314,12 87,14.686 87,18V60C87,63.314 84.314,66 81,66H15C11.686,66 9,63.314 9,60V18Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M81,14H15C12.791,14 11,15.791 11,18V60C11,62.209 12.791,64 15,64H81C83.209,64 85,62.209 85,60V18C85,15.791 83.209,14 81,14ZM15,12C11.686,12 9,14.686 9,18V60C9,63.314 11.686,66 15,66H81C84.314,66 87,63.314 87,60V18C87,14.686 84.314,12 81,12H15Z" />
-    <path
-        android:fillColor="#79A1E9"
-        android:pathData="M9,18H87V60H9V18Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M85,20H11V58H85V20ZM9,18V60H87V18H9Z" />
-    <path
-        android:fillColor="#AAC3EF"
-        android:pathData="M39,65H57V83H39V65Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M38,64H58V82H66C66.552,82 67,82.448 67,83C67,83.552 66.552,84 66,84H30C29.448,84 29,83.552 29,83C29,82.448 29.448,82 30,82H38V64ZM40,82H56V66H40V82Z" />
-    <path
-        android:fillColor="#F3F6F9"
-        android:pathData="M0,48C0,45.791 1.791,44 4,44H22C24.209,44 26,45.791 26,48V80C26,82.209 24.209,84 22,84H4C1.791,84 0,82.209 0,80V48Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M22,46H4C2.895,46 2,46.895 2,48V80C2,81.105 2.895,82 4,82H22C23.105,82 24,81.105 24,80V48C24,46.895 23.105,46 22,46ZM4,44C1.791,44 0,45.791 0,48V80C0,82.209 1.791,84 4,84H22C24.209,84 26,82.209 26,80V48C26,45.791 24.209,44 22,44H4Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M10,49C10,48.448 10.448,48 11,48L15,48C15.552,48 16,48.448 16,49C16,49.552 15.552,50 15,50L11,50C10.448,50 10,49.552 10,49Z" />
-    <path
-        android:fillColor="#AAC3EF"
-        android:fillType="evenOdd"
-        android:pathData="M48,55C56.837,55 64,47.837 64,39C64,30.163 56.837,23 48,23C39.163,23 32,30.163 32,39C32,47.837 39.163,55 48,55ZM41,33C39.343,33 38,34.343 38,36V46C38,47.657 39.343,49 41,49H55C56.657,49 58,47.657 58,46V36C58,34.343 56.657,33 55,33H41Z" />
-    <path
-        android:fillColor="#FFBF00"
-        android:pathData="M38,36C38,34.343 39.343,33 41,33H55C56.657,33 58,34.343 58,36V46C58,47.657 56.657,49 55,49H41C39.343,49 38,47.657 38,46V36Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M55,35H41C40.448,35 40,35.448 40,36V46C40,46.552 40.448,47 41,47H55C55.552,47 56,46.552 56,46V36C56,35.448 55.552,35 55,35ZM41,33C39.343,33 38,34.343 38,36V46C38,47.657 39.343,49 41,49H55C56.657,49 58,47.657 58,46V36C58,34.343 56.657,33 55,33H41Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:pathData="M47,39C47,38.448 47.448,38 48,38C48.552,38 49,38.448 49,39V43C49,43.552 48.552,44 48,44C47.448,44 47,43.552 47,43V39Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M43,32C43,29.239 45.239,27 48,27C50.761,27 53,29.239 53,32V33H51V32C51,30.343 49.657,29 48,29C46.343,29 45,30.343 45,32V33H43V32Z" />
-    <path
-        android:fillColor="#F3F6F9"
-        android:pathData="M60,40C60,37.791 61.791,36 64,36H92C94.209,36 96,37.791 96,40V80C96,82.209 94.209,84 92,84H64C61.791,84 60,82.209 60,80V40Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M92,38H64C62.895,38 62,38.895 62,40V80C62,81.105 62.895,82 64,82H92C93.105,82 94,81.105 94,80V40C94,38.895 93.105,38 92,38ZM64,36C61.791,36 60,37.791 60,40V80C60,82.209 61.791,84 64,84H92C94.209,84 96,82.209 96,80V40C96,37.791 94.209,36 92,36H64Z" />
-    <path
-        android:fillColor="#79A1E9"
-        android:pathData="M81,76C81,77.657 79.657,79 78,79C76.343,79 75,77.657 75,76C75,74.343 76.343,73 78,73C79.657,73 81,74.343 81,76Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M78,77C78.552,77 79,76.552 79,76C79,75.448 78.552,75 78,75C77.448,75 77,75.448 77,76C77,76.552 77.448,77 78,77ZM78,79C79.657,79 81,77.657 81,76C81,74.343 79.657,73 78,73C76.343,73 75,74.343 75,76C75,77.657 76.343,79 78,79Z" />
-    <path
-        android:fillColor="#79A1E9"
-        android:pathData="M40,66H56V72H40V66Z" />
-</vector>
diff --git a/app/src/main/res/drawable-night/img_2fa.xml b/app/src/main/res/drawable-night/img_2fa.xml
deleted file mode 100644
index 2f2753f584..0000000000
--- a/app/src/main/res/drawable-night/img_2fa.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-    <path
-        android:fillColor="#AAC3EF"
-        android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H125C131.9,25.67 137.5,31.26 137.5,38.17V117.33C137.5,124.24 131.9,129.83 125,129.83H12.5C5.6,129.83 0,124.24 0,117.33V38.17Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M125,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V117.33C4.17,121.94 7.9,125.67 12.5,125.67H125C129.6,125.67 133.33,121.94 133.33,117.33V38.17C133.33,33.56 129.6,29.83 125,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V117.33C0,124.24 5.6,129.83 12.5,129.83H125C131.9,129.83 137.5,124.24 137.5,117.33V38.17C137.5,31.26 131.9,25.67 125,25.67H12.5Z" />
-    <path
-        android:fillColor="#79A1E9"
-        android:pathData="M47.92,75.67C47.92,72.21 50.71,69.42 54.17,69.42H83.33C86.78,69.42 89.58,72.21 89.58,75.67V96.5C89.58,99.95 86.78,102.75 83.33,102.75H54.17C50.71,102.75 47.92,99.95 47.92,96.5V75.67Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M83.33,73.58H54.17C53.02,73.58 52.08,74.52 52.08,75.67V96.5C52.08,97.65 53.02,98.58 54.17,98.58H83.33C84.48,98.58 85.42,97.65 85.42,96.5V75.67C85.42,74.52 84.48,73.58 83.33,73.58ZM54.17,69.42C50.71,69.42 47.92,72.21 47.92,75.67V96.5C47.92,99.95 50.71,102.75 54.17,102.75H83.33C86.78,102.75 89.58,99.95 89.58,96.5V75.67C89.58,72.21 86.78,69.42 83.33,69.42H54.17Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:pathData="M66.67,81.92C66.67,80.77 67.6,79.83 68.75,79.83C69.9,79.83 70.83,80.77 70.83,81.92V90.25C70.83,91.4 69.9,92.33 68.75,92.33C67.6,92.33 66.67,91.4 66.67,90.25V81.92Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M58.33,67.33C58.33,61.58 63,56.92 68.75,56.92C74.5,56.92 79.17,61.58 79.17,67.33V69.42H75V67.33C75,63.88 72.2,61.08 68.75,61.08C65.3,61.08 62.5,63.88 62.5,67.33V69.42H58.33V67.33Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M135.42,50.67H2.08V46.5H135.42V50.67Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:pathData="M129.17,38.17C129.17,40.47 127.3,42.33 125,42.33C122.7,42.33 120.83,40.47 120.83,38.17C120.83,35.87 122.7,34 125,34C127.3,34 129.17,35.87 129.17,38.17Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:pathData="M116.67,38.17C116.67,40.47 114.8,42.33 112.5,42.33C110.2,42.33 108.33,40.47 108.33,38.17C108.33,35.87 110.2,34 112.5,34C114.8,34 116.67,35.87 116.67,38.17Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:pathData="M104.17,38.17C104.17,40.47 102.3,42.33 100,42.33C97.7,42.33 95.83,40.47 95.83,38.17C95.83,35.87 97.7,34 100,34C102.3,34 104.17,35.87 104.17,38.17Z" />
-    <path
-        android:fillColor="#F3F6F9"
-        android:pathData="M170.83,88.17C170.83,104.28 157.77,117.33 141.67,117.33C125.56,117.33 112.5,104.28 112.5,88.17C112.5,72.06 125.56,59 141.67,59C157.77,59 170.83,72.06 170.83,88.17Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M141.67,113.17C155.47,113.17 166.67,101.97 166.67,88.17C166.67,74.36 155.47,63.17 141.67,63.17C127.86,63.17 116.67,74.36 116.67,88.17C116.67,101.97 127.86,113.17 141.67,113.17ZM141.67,117.33C157.77,117.33 170.83,104.28 170.83,88.17C170.83,72.06 157.77,59 141.67,59C125.56,59 112.5,72.06 112.5,88.17C112.5,104.28 125.56,117.33 141.67,117.33Z" />
-    <path
-        android:fillColor="#F3F6F9"
-        android:pathData="M195.64,150.62C198.52,157.57 200,165.02 200,172.54C200,174.27 198.6,175.67 196.87,175.67H88.54C86.82,175.67 85.42,174.27 85.42,172.54C85.42,165.02 86.9,157.57 89.78,150.62C92.66,143.67 96.88,137.35 102.2,132.03C107.52,126.71 113.83,122.49 120.78,119.61C127.73,116.73 135.18,115.25 142.71,115.25C150.23,115.25 157.68,116.73 164.63,119.61C171.58,122.49 177.9,126.71 183.22,132.03C188.54,137.35 192.76,143.67 195.64,150.62Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M195.82,171.5C195.69,164.88 194.33,158.34 191.79,152.21C189.12,145.77 185.21,139.91 180.27,134.98C175.34,130.04 169.48,126.13 163.04,123.46C156.59,120.79 149.68,119.42 142.71,119.42C135.73,119.42 128.82,120.79 122.38,123.46C115.93,126.13 110.08,130.04 105.14,134.98C100.21,139.91 96.3,145.77 93.63,152.21C91.09,158.34 89.72,164.88 89.59,171.5H195.82ZM200,172.54C200,165.02 198.52,157.57 195.64,150.62C192.76,143.67 188.54,137.35 183.22,132.03C177.9,126.71 171.58,122.49 164.63,119.61C157.68,116.73 150.23,115.25 142.71,115.25C135.18,115.25 127.73,116.73 120.78,119.61C113.83,122.49 107.52,126.71 102.2,132.03C96.88,137.35 92.66,143.67 89.78,150.62C86.9,157.57 85.42,165.02 85.42,172.54C85.42,174.27 86.82,175.67 88.54,175.67H196.87C198.6,175.67 200,174.27 200,172.54Z" />
-    <path
-        android:fillColor="#FFBF00"
-        android:pathData="M22.92,127.75C22.92,118.54 30.38,111.08 39.58,111.08H95.83C105.04,111.08 112.5,118.54 112.5,127.75C112.5,136.95 105.04,144.42 95.83,144.42H39.58C30.38,144.42 22.92,136.95 22.92,127.75Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M95.83,115.25H39.58C32.68,115.25 27.08,120.85 27.08,127.75C27.08,134.65 32.68,140.25 39.58,140.25H95.83C102.74,140.25 108.33,134.65 108.33,127.75C108.33,120.85 102.74,115.25 95.83,115.25ZM39.58,111.08C30.38,111.08 22.92,118.54 22.92,127.75C22.92,136.95 30.38,144.42 39.58,144.42H95.83C105.04,144.42 112.5,136.95 112.5,127.75C112.5,118.54 105.04,111.08 95.83,111.08H39.58Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M41.68,120.61C42.83,120.61 43.76,121.54 43.76,122.69V125.61L46.49,124.71C47.59,124.36 48.76,124.95 49.12,126.05C49.48,127.14 48.88,128.32 47.79,128.67L45.02,129.58L46.76,132.01C47.42,132.95 47.21,134.25 46.27,134.92C45.33,135.59 44.03,135.37 43.36,134.43L41.68,132.07L39.99,134.43C39.32,135.37 38.02,135.59 37.08,134.92C36.15,134.25 35.93,132.95 36.6,132.01L38.33,129.58L35.56,128.67C34.47,128.32 33.87,127.14 34.23,126.05C34.59,124.95 35.77,124.36 36.86,124.71L39.59,125.61V122.69C39.59,121.54 40.53,120.61 41.68,120.61ZM60.43,120.61C61.58,120.61 62.51,121.54 62.51,122.69V125.61L65.24,124.71C66.34,124.36 67.51,124.95 67.87,126.05C68.23,127.14 67.63,128.32 66.54,128.67L63.77,129.58L65.51,132.01C66.17,132.95 65.96,134.25 65.02,134.92C64.08,135.59 62.78,135.37 62.11,134.43L60.43,132.07L58.74,134.43C58.07,135.37 56.77,135.59 55.83,134.92C54.9,134.25 54.68,132.95 55.35,132.01L57.08,129.58L54.31,128.67C53.22,128.32 52.62,127.14 52.98,126.05C53.34,124.95 54.52,124.36 55.61,124.71L58.34,125.61V122.69C58.34,121.54 59.28,120.61 60.43,120.61Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M72.92,131.92C72.92,130.77 73.85,129.83 75,129.83L83.33,129.83C84.48,129.83 85.42,130.77 85.42,131.92C85.42,133.07 84.48,134 83.33,134L75,134C73.85,134 72.92,133.07 72.92,131.92Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M89.58,131.92C89.58,130.77 90.52,129.83 91.67,129.83L100,129.83C101.15,129.83 102.08,130.77 102.08,131.92C102.08,133.07 101.15,134 100,134L91.67,134C90.52,134 89.58,133.07 89.58,131.92Z" />
-</vector>
diff --git a/app/src/main/res/drawable-night/img_authenticator.xml b/app/src/main/res/drawable-night/img_authenticator.xml
deleted file mode 100644
index 64b35b183e..0000000000
--- a/app/src/main/res/drawable-night/img_authenticator.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<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-night/img_folder_question.xml b/app/src/main/res/drawable-night/img_folder_question.xml
deleted file mode 100644
index f6d85261e1..0000000000
--- a/app/src/main/res/drawable-night/img_folder_question.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-    <path
-        android:fillColor="#79A1E9"
-        android:pathData="M4.17,44.42C4.17,37.51 9.76,31.92 16.67,31.92H52.58C56.23,31.92 59.7,33.51 62.07,36.28L70.83,46.5H179.17C183.77,46.5 187.5,50.23 187.5,54.83V129.83C187.5,155.15 166.98,175.67 141.67,175.67H14.58C8.83,175.67 4.17,171 4.17,165.25V44.42Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M68.92,50.67L58.91,38.99C57.33,37.15 55.02,36.08 52.58,36.08H16.67C12.06,36.08 8.33,39.81 8.33,44.42V165.25C8.33,168.7 11.13,171.5 14.58,171.5H141.67C164.68,171.5 183.33,152.85 183.33,129.83V54.83C183.33,52.53 181.47,50.67 179.17,50.67H68.92ZM70.83,46.5L62.07,36.28C59.7,33.51 56.23,31.92 52.58,31.92H16.67C9.76,31.92 4.17,37.51 4.17,44.42V165.25C4.17,171 8.83,175.67 14.58,175.67H141.67C166.98,175.67 187.5,155.15 187.5,129.83V54.83C187.5,50.23 183.77,46.5 179.17,46.5H70.83Z" />
-    <path
-        android:fillColor="#AAC3EF"
-        android:pathData="M22.96,83.58C24.15,77.76 29.27,73.58 35.21,73.58H189.79C195.07,73.58 199.01,78.42 197.96,83.58L181.21,165.67C180.02,171.49 174.9,175.67 168.96,175.67H14.37C9.1,175.67 5.15,170.83 6.21,165.67L22.96,83.58Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M189.79,77.75H35.21C31.25,77.75 27.83,80.54 27.04,84.42L10.29,166.5C9.76,169.08 11.74,171.5 14.37,171.5H168.96C172.92,171.5 176.33,168.71 177.13,164.83L193.88,82.75C194.4,80.17 192.43,77.75 189.79,77.75ZM35.21,73.58C29.27,73.58 24.15,77.76 22.96,83.58L6.21,165.67C5.15,170.83 9.1,175.67 14.37,175.67H168.96C174.9,175.67 180.02,171.49 181.21,165.67L197.96,83.58C199.01,78.42 195.07,73.58 189.79,73.58H35.21Z" />
-    <path
-        android:fillColor="#F3F6F9"
-        android:pathData="M175,67.33C175,90.35 156.35,109 133.33,109C110.32,109 91.67,90.35 91.67,67.33C91.67,44.32 110.32,25.67 133.33,25.67C156.35,25.67 175,44.32 175,67.33Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M133.33,104.83C154.04,104.83 170.83,88.04 170.83,67.33C170.83,46.62 154.04,29.83 133.33,29.83C112.62,29.83 95.83,46.62 95.83,67.33C95.83,88.04 112.62,104.83 133.33,104.83ZM133.33,109C156.35,109 175,90.35 175,67.33C175,44.32 156.35,25.67 133.33,25.67C110.32,25.67 91.67,44.32 91.67,67.33C91.67,90.35 110.32,109 133.33,109Z" />
-    <path
-        android:fillColor="#FFBF00"
-        android:pathData="M164.58,67.33C164.58,84.59 150.59,98.58 133.33,98.58C116.07,98.58 102.08,84.59 102.08,67.33C102.08,50.07 116.07,36.08 133.33,36.08C150.59,36.08 164.58,50.07 164.58,67.33Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:pathData="M197.93,127.93L163.54,95.46L159.38,99.62L191.85,134.01C193.46,135.71 196.16,135.75 197.82,134.09L198.01,133.91C199.67,132.25 199.63,129.54 197.93,127.93Z" />
-    <path
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"
-        android:pathData="M128.28,71.66C128.31,72.73 129.18,73.58 130.25,73.58H131.36C132.45,73.58 133.34,72.7 133.34,71.61L133.34,69.42C139.21,69.33 143.75,66.08 143.75,60.04C143.75,53.64 139.51,50.67 133.34,50.67C127.94,50.67 123.09,54.23 122.84,59.37C122.79,60.36 123.65,61.08 124.63,61.08H125.11C126.2,61.08 127.05,60.18 127.37,59.14C128.21,56.43 130.77,54.83 133.34,54.83C136.46,54.83 139.06,56.68 139.06,60.04C139.06,65.01 133.72,65.92 129.65,66.06C128.81,66.09 128.15,66.77 128.17,67.6L128.28,71.66ZM130.73,82.96C133.03,82.96 134.9,81.56 134.9,79.83C134.9,78.11 133.03,76.71 130.73,76.71C128.43,76.71 126.56,78.11 126.56,79.83C126.56,81.56 128.43,82.96 130.73,82.96Z" />
-</vector>
diff --git a/app/src/main/res/drawable-night/img_import_logins.xml b/app/src/main/res/drawable-night/img_import_logins.xml
deleted file mode 100644
index 64443dc268..0000000000
--- a/app/src/main/res/drawable-night/img_import_logins.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <group>
-    <clip-path
-        android:pathData="M0,0.67h200v200h-200z"/>
-    <path
-        android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H154.17C161.07,25.67 166.67,31.26 166.67,38.17V138.17C166.67,145.07 161.07,150.67 154.17,150.67H12.5C5.6,150.67 0,145.07 0,138.17V38.17Z"
-        android:fillColor="#79A1E9"/>
-    <path
-        android:pathData="M154.17,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V138.17C4.17,142.77 7.9,146.5 12.5,146.5H154.17C158.77,146.5 162.5,142.77 162.5,138.17V38.17C162.5,33.56 158.77,29.83 154.17,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V138.17C0,145.07 5.6,150.67 12.5,150.67H154.17C161.07,150.67 166.67,145.07 166.67,138.17V38.17C166.67,31.26 161.07,25.67 154.17,25.67H12.5Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M164.58,50.67L2.08,50.67L2.08,46.5L164.58,46.5L164.58,50.67Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M158.33,38.17C158.33,40.47 156.47,42.33 154.17,42.33C151.87,42.33 150,40.47 150,38.17C150,35.87 151.87,34 154.17,34C156.47,34 158.33,35.87 158.33,38.17Z"
-        android:fillColor="#175DDC"/>
-    <path
-        android:pathData="M145.83,38.17C145.83,40.47 143.97,42.33 141.67,42.33C139.37,42.33 137.5,40.47 137.5,38.17C137.5,35.87 139.37,34 141.67,34C143.97,34 145.83,35.87 145.83,38.17Z"
-        android:fillColor="#175DDC"/>
-    <path
-        android:pathData="M133.33,38.17C133.33,40.47 131.47,42.33 129.17,42.33C126.86,42.33 125,40.47 125,38.17C125,35.87 126.86,34 129.17,34C131.47,34 133.33,35.87 133.33,38.17Z"
-        android:fillColor="#175DDC"/>
-    <path
-        android:pathData="M125,67.33C125,60.43 130.6,54.83 137.5,54.83H187.5C194.4,54.83 200,60.43 200,67.33V175.67C200,182.57 194.4,188.17 187.5,188.17H137.5C130.6,188.17 125,182.57 125,175.67V67.33Z"
-        android:fillColor="#AAC3EF"/>
-    <path
-        android:pathData="M187.5,59H137.5C132.9,59 129.17,62.73 129.17,67.33V175.67C129.17,180.27 132.9,184 137.5,184H187.5C192.1,184 195.83,180.27 195.83,175.67V67.33C195.83,62.73 192.1,59 187.5,59ZM137.5,54.83C130.6,54.83 125,60.43 125,67.33V175.67C125,182.57 130.6,188.17 137.5,188.17H187.5C194.4,188.17 200,182.57 200,175.67V67.33C200,60.43 194.4,54.83 187.5,54.83H137.5Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M152.08,67.33C152.08,66.18 153.02,65.25 154.17,65.25H170.83C171.99,65.25 172.92,66.18 172.92,67.33C172.92,68.48 171.99,69.42 170.83,69.42H154.17C153.02,69.42 152.08,68.48 152.08,67.33Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M141.67,173.58C141.67,170.13 144.46,167.33 147.92,167.33H177.08C180.53,167.33 183.33,170.13 183.33,173.58V194.42C183.33,197.87 180.53,200.67 177.08,200.67H147.92C144.46,200.67 141.67,197.87 141.67,194.42V173.58Z"
-        android:fillColor="#FFBF00"/>
-    <path
-        android:pathData="M177.08,171.5H147.92C146.76,171.5 145.83,172.43 145.83,173.58V194.42C145.83,195.57 146.76,196.5 147.92,196.5H177.08C178.23,196.5 179.17,195.57 179.17,194.42V173.58C179.17,172.43 178.23,171.5 177.08,171.5ZM147.92,167.33C144.46,167.33 141.67,170.13 141.67,173.58V194.42C141.67,197.87 144.46,200.67 147.92,200.67H177.08C180.53,200.67 183.33,197.87 183.33,194.42V173.58C183.33,170.13 180.53,167.33 177.08,167.33H147.92Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M160.42,179.83C160.42,178.68 161.35,177.75 162.5,177.75C163.65,177.75 164.58,178.68 164.58,179.83V188.17C164.58,189.32 163.65,190.25 162.5,190.25C161.35,190.25 160.42,189.32 160.42,188.17V179.83Z"
-        android:fillColor="#175DDC"/>
-    <path
-        android:pathData="M152.08,165.25C152.08,159.5 156.75,154.83 162.5,154.83C168.25,154.83 172.92,159.5 172.92,165.25V167.33H168.75V165.25C168.75,161.8 165.95,159 162.5,159C159.05,159 156.25,161.8 156.25,165.25V167.33H152.08V165.25Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M83.33,111.08C84.48,111.08 85.42,112.02 85.42,113.17V125.67C85.42,129.12 88.21,131.92 91.67,131.92H159.55L150.61,122.97C149.8,122.16 149.8,120.84 150.61,120.03C151.42,119.21 152.74,119.21 153.56,120.03L166.06,132.53C166.87,133.34 166.87,134.66 166.06,135.47L153.56,147.97C152.74,148.79 151.42,148.79 150.61,147.97C149.8,147.16 149.8,145.84 150.61,145.03L159.55,136.08H91.67C85.91,136.08 81.25,131.42 81.25,125.67V113.17C81.25,112.02 82.18,111.08 83.33,111.08Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M54.17,81.92C54.17,78.46 56.96,75.67 60.42,75.67H106.25C109.7,75.67 112.5,78.46 112.5,81.92V115.25C112.5,118.7 109.7,121.5 106.25,121.5H60.42C56.96,121.5 54.17,118.7 54.17,115.25V81.92Z"
-        android:fillColor="#F3F6F9"/>
-    <path
-        android:pathData="M106.25,79.83H60.42C59.27,79.83 58.33,80.77 58.33,81.92V115.25C58.33,116.4 59.27,117.33 60.42,117.33H106.25C107.4,117.33 108.33,116.4 108.33,115.25V81.92C108.33,80.77 107.4,79.83 106.25,79.83ZM60.42,75.67C56.96,75.67 54.17,78.46 54.17,81.92V115.25C54.17,118.7 56.96,121.5 60.42,121.5H106.25C109.7,121.5 112.5,118.7 112.5,115.25V81.92C112.5,78.46 109.7,75.67 106.25,75.67H60.42Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M81.25,92.33C81.25,91.18 82.18,90.25 83.33,90.25C84.48,90.25 85.42,91.18 85.42,92.33V104.83C85.42,105.98 84.48,106.92 83.33,106.92C82.18,106.92 81.25,105.98 81.25,104.83V92.33Z"
-        android:fillColor="#175DDC"/>
-    <path
-        android:pathData="M66.67,71.5C66.67,62.29 74.13,54.83 83.33,54.83C92.54,54.83 100,62.29 100,71.5V75.67H95.83V71.5C95.83,64.6 90.24,59 83.33,59C76.43,59 70.83,64.6 70.83,71.5V75.67H66.67V71.5Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable-night/img_secure_devices.xml b/app/src/main/res/drawable-night/img_secure_devices.xml
deleted file mode 100644
index 45b2b74a46..0000000000
--- a/app/src/main/res/drawable-night/img_secure_devices.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<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="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M100,115.25C118.41,115.25 133.33,100.33 133.33,81.92C133.33,63.51 118.41,48.58 100,48.58C81.59,48.58 66.67,63.51 66.67,81.92C66.67,100.33 81.59,115.25 100,115.25ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M79.17,75.67C79.17,72.21 81.96,69.42 85.42,69.42H114.58C118.03,69.42 120.83,72.21 120.83,75.67V96.5C120.83,99.95 118.03,102.75 114.58,102.75H85.42C81.96,102.75 79.17,99.95 79.17,96.5V75.67Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M114.58,73.58H85.42C84.27,73.58 83.33,74.52 83.33,75.67V96.5C83.33,97.65 84.27,98.58 85.42,98.58H114.58C115.73,98.58 116.67,97.65 116.67,96.5V75.67C116.67,74.52 115.73,73.58 114.58,73.58ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M97.92,81.92C97.92,80.77 98.85,79.83 100,79.83C101.15,79.83 102.08,80.77 102.08,81.92V90.25C102.08,91.4 101.15,92.33 100,92.33C98.85,92.33 97.92,91.4 97.92,90.25V81.92Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M89.58,67.33C89.58,61.58 94.25,56.92 100,56.92C105.75,56.92 110.42,61.58 110.42,67.33V69.42H106.25V67.33C106.25,63.88 103.45,61.08 100,61.08C96.55,61.08 93.75,63.88 93.75,67.33V69.42H89.58V67.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z"
-      android:fillColor="#79A1E9"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/img_send.xml b/app/src/main/res/drawable-night/img_send.xml
deleted file mode 100644
index 1ccba76602..0000000000
--- a/app/src/main/res/drawable-night/img_send.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M139.58,25.67C141.88,25.67 143.75,27.53 143.75,29.83L143.75,188.17C143.75,190.47 141.88,192.33 139.58,192.33L22.92,192.33C20.62,192.33 18.75,190.47 18.75,188.17L18.75,29.83C18.75,27.53 20.62,25.67 22.92,25.67L139.58,25.67Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M139.58,188.17L139.58,29.83L22.92,29.83L22.92,188.17L139.58,188.17ZM143.75,29.83C143.75,27.53 141.88,25.67 139.58,25.67L22.92,25.67C20.62,25.67 18.75,27.53 18.75,29.83L18.75,188.17C18.75,190.47 20.62,192.33 22.92,192.33L139.58,192.33C141.88,192.33 143.75,190.47 143.75,188.17L143.75,29.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M160.42,171.5L160.42,13.17C160.42,10.87 158.55,9 156.25,9L67.35,9C66.25,9 65.19,9.43 64.41,10.21L36.63,37.99C35.85,38.77 35.42,39.83 35.42,40.93L35.42,171.5C35.42,173.8 37.28,175.67 39.58,175.67L156.25,175.67C158.55,175.67 160.42,173.8 160.42,171.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M156.25,171.5L156.25,13.17L67.35,13.17L39.58,40.93L39.58,171.5L156.25,171.5ZM67.36,13.16C67.36,13.16 67.36,13.16 67.36,13.16L67.36,13.16ZM160.42,13.17L160.42,171.5C160.42,173.8 158.55,175.67 156.25,175.67L39.58,175.67C37.28,175.67 35.42,173.8 35.42,171.5L35.42,40.93C35.42,39.83 35.85,38.77 36.63,37.99L64.41,10.21C65.19,9.43 66.25,9 67.35,9L156.25,9C158.55,9 160.42,10.87 160.42,13.17Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M68.75,11.08C69.9,11.08 70.83,12.02 70.83,13.17V44.42H39.58C38.43,44.42 37.5,43.48 37.5,42.33C37.5,41.18 38.43,40.25 39.58,40.25H66.67V13.17C66.67,12.02 67.6,11.08 68.75,11.08Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M77.08,73.58C77.08,70.13 79.88,67.33 83.33,67.33H112.5C115.95,67.33 118.75,70.13 118.75,73.58V94.42C118.75,97.87 115.95,100.67 112.5,100.67H83.33C79.88,100.67 77.08,97.87 77.08,94.42V73.58Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M112.5,71.5H83.33C82.18,71.5 81.25,72.43 81.25,73.58V94.42C81.25,95.57 82.18,96.5 83.33,96.5H112.5C113.65,96.5 114.58,95.57 114.58,94.42V73.58C114.58,72.43 113.65,71.5 112.5,71.5ZM83.33,67.33C79.88,67.33 77.08,70.13 77.08,73.58V94.42C77.08,97.87 79.88,100.67 83.33,100.67H112.5C115.95,100.67 118.75,97.87 118.75,94.42V73.58C118.75,70.13 115.95,67.33 112.5,67.33H83.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M95.83,79.83C95.83,78.68 96.77,77.75 97.92,77.75C99.07,77.75 100,78.68 100,79.83V88.17C100,89.32 99.07,90.25 97.92,90.25C96.77,90.25 95.83,89.32 95.83,88.17V79.83Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M87.5,65.25C87.5,59.5 92.16,54.83 97.92,54.83C103.67,54.83 108.33,59.5 108.33,65.25V67.33H104.17V65.25C104.17,61.8 101.37,59 97.92,59C94.46,59 91.67,61.8 91.67,65.25V67.33H87.5V65.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M129.17,192.45V163.17L154.17,176.5L136.13,195.26C135.37,196.05 134.31,196.5 133.21,196.5C130.98,196.5 129.17,194.69 129.17,192.45Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M127.08,159.69L157.58,175.96L137.63,196.7C136.48,197.9 134.88,198.58 133.21,198.58C129.83,198.58 127.08,195.84 127.08,192.45V159.69ZM131.25,166.64V192.45C131.25,193.54 132.13,194.42 133.21,194.42C133.75,194.42 134.26,194.2 134.63,193.81L150.76,177.04L131.25,166.64Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M88.64,138.11L184.03,93.46C187.69,91.74 191.83,94.68 191.42,98.71L181.82,191.72C181.41,195.7 176.85,197.75 173.6,195.42L130.21,164.21L88.92,147.66C84.69,145.96 84.52,140.04 88.64,138.11Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M189.34,98.49C189.59,96.08 187.11,94.31 184.91,95.34L89.53,139.99C87.05,141.15 87.15,144.71 89.69,145.73L129.62,161.73L156.42,131.28C157.18,130.42 158.5,130.34 159.36,131.1C160.23,131.86 160.31,133.17 159.55,134.04L133.29,163.86L174.82,193.73C176.77,195.13 179.51,193.9 179.75,191.51L189.34,98.49ZM129.2,166.05L88.14,149.59C82.22,147.22 81.98,138.93 87.76,136.22L183.14,91.57C188.28,89.17 194.07,93.28 193.49,98.92L183.9,191.94C183.32,197.51 176.93,200.38 172.38,197.11L129.2,166.05Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/img_setup_complete.xml b/app/src/main/res/drawable-night/img_setup_complete.xml
deleted file mode 100644
index f2b8d9b7f2..0000000000
--- a/app/src/main/res/drawable-night/img_setup_complete.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M0,42.33C0,33.13 7.46,25.67 16.67,25.67H183.33C192.54,25.67 200,33.13 200,42.33V159C200,168.21 192.54,175.67 183.33,175.67H16.67C7.46,175.67 0,168.21 0,159V42.33Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M183.33,29.83H16.67C9.76,29.83 4.17,35.43 4.17,42.33V159C4.17,165.9 9.76,171.5 16.67,171.5H183.33C190.24,171.5 195.83,165.9 195.83,159V42.33C195.83,35.43 190.24,29.83 183.33,29.83ZM16.67,25.67C7.46,25.67 0,33.13 0,42.33V159C0,168.21 7.46,175.67 16.67,175.67H183.33C192.54,175.67 200,168.21 200,159V42.33C200,33.13 192.54,25.67 183.33,25.67H16.67Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,56.92C18.75,54.62 20.62,52.75 22.92,52.75H177.08C179.38,52.75 181.25,54.62 181.25,56.92V81.92C181.25,84.22 179.38,86.08 177.08,86.08H22.92C20.62,86.08 18.75,84.22 18.75,81.92V56.92Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M177.08,56.92H22.92L22.92,81.92H177.08V56.92ZM22.92,52.75C20.62,52.75 18.75,54.62 18.75,56.92V81.92C18.75,84.22 20.62,86.08 22.92,86.08H177.08C179.38,86.08 181.25,84.22 181.25,81.92V56.92C181.25,54.62 179.38,52.75 177.08,52.75H22.92Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,119.42C18.75,117.11 20.62,115.25 22.92,115.25H177.08C179.38,115.25 181.25,117.11 181.25,119.42V144.42C181.25,146.72 179.38,148.58 177.08,148.58H22.92C20.62,148.58 18.75,146.72 18.75,144.42V119.42Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M177.08,119.42H22.92L22.92,144.42H177.08V119.42ZM22.92,115.25C20.62,115.25 18.75,117.11 18.75,119.42V144.42C18.75,146.72 20.62,148.58 22.92,148.58H177.08C179.38,148.58 181.25,146.72 181.25,144.42V119.42C181.25,117.11 179.38,115.25 177.08,115.25H22.92Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M35.42,124.78C36.58,124.78 37.51,125.71 37.51,126.86V129.78L40.24,128.88C41.33,128.52 42.51,129.12 42.87,130.21C43.23,131.31 42.63,132.48 41.54,132.84L38.77,133.75L40.5,136.18C41.17,137.12 40.95,138.42 40.02,139.08C39.08,139.75 37.78,139.54 37.11,138.6L35.42,136.24L33.74,138.6C33.07,139.54 31.77,139.75 30.83,139.09C29.89,138.42 29.68,137.12 30.35,136.18L32.08,133.75L29.31,132.84C28.22,132.48 27.62,131.31 27.98,130.21C28.34,129.12 29.51,128.52 30.61,128.88L33.34,129.78V126.86C33.34,125.71 34.27,124.78 35.42,124.78ZM54.17,124.78C55.33,124.78 56.26,125.71 56.26,126.86V129.78L58.99,128.88C60.08,128.52 61.26,129.12 61.62,130.21C61.98,131.31 61.38,132.48 60.29,132.84L57.52,133.75L59.25,136.18C59.92,137.12 59.7,138.42 58.77,139.08C57.83,139.75 56.53,139.54 55.86,138.6L54.17,136.24L52.49,138.6C51.82,139.54 50.52,139.75 49.58,139.09C48.64,138.42 48.43,137.12 49.1,136.18L50.83,133.75L48.06,132.84C46.97,132.48 46.37,131.31 46.73,130.21C47.09,129.12 48.26,128.52 49.36,128.88L52.09,129.78V126.86C52.09,125.71 53.02,124.78 54.17,124.78ZM72.92,124.78C74.08,124.78 75.01,125.71 75.01,126.86V129.78L77.74,128.88C78.83,128.52 80.01,129.12 80.37,130.21C80.73,131.31 80.13,132.48 79.04,132.84L76.27,133.75L78,136.18C78.67,137.12 78.45,138.42 77.52,139.08C76.58,139.75 75.28,139.54 74.61,138.6L72.92,136.24L71.24,138.6C70.57,139.54 69.27,139.75 68.33,139.09C67.39,138.42 67.18,137.12 67.85,136.18L69.58,133.75L66.81,132.84C65.72,132.48 65.12,131.31 65.48,130.21C65.84,129.12 67.01,128.52 68.11,128.88L70.84,129.78V126.86C70.84,125.71 71.77,124.78 72.92,124.78ZM91.67,124.78C92.83,124.78 93.76,125.71 93.76,126.86V129.78L96.49,128.88C97.58,128.52 98.76,129.12 99.12,130.21C99.48,131.31 98.88,132.48 97.79,132.84L95.02,133.75L96.75,136.18C97.42,137.12 97.2,138.42 96.27,139.08C95.33,139.75 94.03,139.54 93.36,138.6L91.67,136.24L89.99,138.6C89.32,139.54 88.02,139.75 87.08,139.09C86.14,138.42 85.93,137.12 86.6,136.18L88.33,133.75L85.56,132.84C84.47,132.48 83.87,131.31 84.23,130.21C84.59,129.12 85.76,128.52 86.86,128.88L89.59,129.78V126.86C89.59,125.71 90.52,124.78 91.67,124.78ZM110.43,124.78C111.57,124.78 112.51,125.71 112.51,126.86V129.78L115.24,128.88C116.33,128.52 117.51,129.12 117.87,130.21C118.23,131.31 117.63,132.48 116.54,132.84L113.77,133.75L115.5,136.18C116.17,137.12 115.96,138.42 115.02,139.08C114.08,139.75 112.78,139.54 112.11,138.6L110.43,136.24L108.74,138.6C108.07,139.54 106.77,139.75 105.83,139.09C104.89,138.42 104.68,137.12 105.35,136.18L107.08,133.75L104.31,132.84C103.22,132.48 102.62,131.31 102.98,130.21C103.34,129.12 104.51,128.52 105.61,128.88L108.34,129.78V126.86C108.34,125.71 109.27,124.78 110.43,124.78Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M29.17,69.42C29.17,68.27 30.1,67.33 31.25,67.33L114.58,67.33C115.73,67.33 116.67,68.27 116.67,69.42C116.67,70.57 115.73,71.5 114.58,71.5L31.25,71.5C30.1,71.5 29.17,70.57 29.17,69.42Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M170.22,61.69C171.04,62.51 171.04,63.83 170.22,64.64L157.72,77.14C156.91,77.95 155.59,77.95 154.78,77.14L148.53,70.89C147.71,70.08 147.71,68.76 148.53,67.94C149.34,67.13 150.66,67.13 151.47,67.94L156.25,72.72L167.28,61.69C168.09,60.88 169.41,60.88 170.22,61.69Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M191.67,131.92C191.67,145.72 180.47,156.92 166.67,156.92C152.86,156.92 141.67,145.72 141.67,131.92C141.67,118.11 152.86,106.92 166.67,106.92C180.47,106.92 191.67,118.11 191.67,131.92Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M166.67,152.75C178.17,152.75 187.5,143.42 187.5,131.92C187.5,120.41 178.17,111.08 166.67,111.08C155.16,111.08 145.83,120.41 145.83,131.92C145.83,143.42 155.16,152.75 166.67,152.75ZM166.67,156.92C180.47,156.92 191.67,145.72 191.67,131.92C191.67,118.11 180.47,106.92 166.67,106.92C152.86,106.92 141.67,118.11 141.67,131.92C141.67,145.72 152.86,156.92 166.67,156.92Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M178.56,124.19C179.37,125.01 179.37,126.33 178.56,127.14L163.97,141.72C163.16,142.54 161.84,142.54 161.03,141.72L154.78,135.47C153.96,134.66 153.96,133.34 154.78,132.53C155.59,131.71 156.91,131.71 157.72,132.53L162.5,137.3L175.61,124.19C176.42,123.38 177.74,123.38 178.56,124.19Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M191.67,69.42C191.67,83.22 180.47,94.42 166.67,94.42C152.86,94.42 141.67,83.22 141.67,69.42C141.67,55.61 152.86,44.42 166.67,44.42C180.47,44.42 191.67,55.61 191.67,69.42Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M166.67,90.25C178.17,90.25 187.5,80.92 187.5,69.42C187.5,57.91 178.17,48.58 166.67,48.58C155.16,48.58 145.83,57.91 145.83,69.42C145.83,80.92 155.16,90.25 166.67,90.25ZM166.67,94.42C180.47,94.42 191.67,83.22 191.67,69.42C191.67,55.61 180.47,44.42 166.67,44.42C152.86,44.42 141.67,55.61 141.67,69.42C141.67,83.22 152.86,94.42 166.67,94.42Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M178.56,61.69C179.37,62.51 179.37,63.83 178.56,64.64L163.97,79.22C163.16,80.04 161.84,80.04 161.03,79.22L154.78,72.97C153.96,72.16 153.96,70.84 154.78,70.03C155.59,69.21 156.91,69.21 157.72,70.03L162.5,74.8L175.61,61.69C176.42,60.88 177.74,60.88 178.56,61.69Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/img_vault_items.xml b/app/src/main/res/drawable-night/img_vault_items.xml
deleted file mode 100644
index 3f5e7b6cab..0000000000
--- a/app/src/main/res/drawable-night/img_vault_items.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H79.17C86.07,25.67 91.67,31.26 91.67,38.17V79.83C91.67,86.74 86.07,92.33 79.17,92.33H12.5C5.6,92.33 0,86.74 0,79.83V38.17Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M79.17,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V79.83C4.17,84.44 7.9,88.17 12.5,88.17H79.17C83.77,88.17 87.5,84.44 87.5,79.83V38.17C87.5,33.56 83.77,29.83 79.17,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V79.83C0,86.74 5.6,92.33 12.5,92.33H79.17C86.07,92.33 91.67,86.74 91.67,79.83V38.17C91.67,31.26 86.07,25.67 79.17,25.67H12.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,121.5C0,114.6 5.6,109 12.5,109H79.17C86.07,109 91.67,114.6 91.67,121.5V163.17C91.67,170.07 86.07,175.67 79.17,175.67H12.5C5.6,175.67 0,170.07 0,163.17V121.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M79.17,113.17H12.5C7.9,113.17 4.17,116.9 4.17,121.5V163.17C4.17,167.77 7.9,171.5 12.5,171.5H79.17C83.77,171.5 87.5,167.77 87.5,163.17V121.5C87.5,116.9 83.77,113.17 79.17,113.17ZM12.5,109C5.6,109 0,114.6 0,121.5V163.17C0,170.07 5.6,175.67 12.5,175.67H79.17C86.07,175.67 91.67,170.07 91.67,163.17V121.5C91.67,114.6 86.07,109 79.17,109H12.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M108.33,38.17C108.33,31.26 113.93,25.67 120.83,25.67H187.5C194.4,25.67 200,31.26 200,38.17V79.83C200,86.74 194.4,92.33 187.5,92.33H120.83C113.93,92.33 108.33,86.74 108.33,79.83V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M187.5,29.83H120.83C116.23,29.83 112.5,33.56 112.5,38.17V79.83C112.5,84.44 116.23,88.17 120.83,88.17H187.5C192.1,88.17 195.83,84.44 195.83,79.83V38.17C195.83,33.56 192.1,29.83 187.5,29.83ZM120.83,25.67C113.93,25.67 108.33,31.26 108.33,38.17V79.83C108.33,86.74 113.93,92.33 120.83,92.33H187.5C194.4,92.33 200,86.74 200,79.83V38.17C200,31.26 194.4,25.67 187.5,25.67H120.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M108.33,121.5C108.33,114.6 113.93,109 120.83,109H187.5C194.4,109 200,114.6 200,121.5V163.17C200,170.07 194.4,175.67 187.5,175.67H120.83C113.93,175.67 108.33,170.07 108.33,163.17V121.5Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M187.5,113.17H120.83C116.23,113.17 112.5,116.9 112.5,121.5V163.17C112.5,167.77 116.23,171.5 120.83,171.5H187.5C192.1,171.5 195.83,167.77 195.83,163.17V121.5C195.83,116.9 192.1,113.17 187.5,113.17ZM120.83,109C113.93,109 108.33,114.6 108.33,121.5V163.17C108.33,170.07 113.93,175.67 120.83,175.67H187.5C194.4,175.67 200,170.07 200,163.17V121.5C200,114.6 194.4,109 187.5,109H120.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M112.5,42.33H195.83V50.67H112.5V42.33Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M120.83,73.58C120.83,72.43 121.77,71.5 122.92,71.5H135.42C136.57,71.5 137.5,72.43 137.5,73.58C137.5,74.73 136.57,75.67 135.42,75.67H122.92C121.77,75.67 120.83,74.73 120.83,73.58Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M122.92,127.75C122.92,126.6 123.85,125.67 125,125.67H183.33C184.48,125.67 185.42,126.6 185.42,127.75C185.42,128.9 184.48,129.83 183.33,129.83H125C123.85,129.83 122.92,128.9 122.92,127.75Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M122.92,142.33C122.92,141.18 123.85,140.25 125,140.25H183.33C184.48,140.25 185.42,141.18 185.42,142.33C185.42,143.48 184.48,144.42 183.33,144.42H125C123.85,144.42 122.92,143.48 122.92,142.33Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M122.92,156.92C122.92,155.77 123.85,154.83 125,154.83H152.08C153.23,154.83 154.17,155.77 154.17,156.92C154.17,158.07 153.23,159 152.08,159H125C123.85,159 122.92,158.07 122.92,156.92Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M52.08,127.75C52.08,126.6 53.02,125.67 54.17,125.67H79.17C80.32,125.67 81.25,126.6 81.25,127.75C81.25,128.9 80.32,129.83 79.17,129.83H54.17C53.02,129.83 52.08,128.9 52.08,127.75Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M52.08,136.08C52.08,134.93 53.02,134 54.17,134H64.58C65.73,134 66.67,134.93 66.67,136.08C66.67,137.23 65.73,138.17 64.58,138.17H54.17C53.02,138.17 52.08,137.23 52.08,136.08Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M143.75,73.58C143.75,72.43 144.68,71.5 145.83,71.5H164.58C165.73,71.5 166.67,72.43 166.67,73.58C166.67,74.73 165.73,75.67 164.58,75.67H145.83C144.68,75.67 143.75,74.73 143.75,73.58Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M43.75,130.88C43.75,137.2 38.62,142.33 32.29,142.33C25.96,142.33 20.83,137.2 20.83,130.88C20.83,124.55 25.96,119.42 32.29,119.42C38.62,119.42 43.75,124.55 43.75,130.88Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M32.29,138.17C36.32,138.17 39.58,134.9 39.58,130.88C39.58,126.85 36.32,123.58 32.29,123.58C28.27,123.58 25,126.85 25,130.88C25,134.9 28.27,138.17 32.29,138.17ZM32.29,142.33C38.62,142.33 43.75,137.2 43.75,130.88C43.75,124.55 38.62,119.42 32.29,119.42C25.96,119.42 20.83,124.55 20.83,130.88C20.83,137.2 25.96,142.33 32.29,142.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M54.43,154.88C55.63,157.76 56.25,160.05 56.25,163.17C56.25,164.32 55.32,165.25 54.17,165.25H10.42C9.27,165.25 8.33,164.32 8.33,163.17C8.33,160.05 8.95,157.76 10.16,154.88C11.36,152.01 13.13,149.4 15.35,147.19C17.58,144.99 20.22,143.25 23.12,142.05C26.03,140.86 29.15,140.25 32.29,140.25C35.44,140.25 38.55,140.86 41.46,142.05C44.37,143.25 47.01,144.99 49.23,147.19C51.46,149.4 53.22,152.01 54.43,154.88Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M51.95,161.08C51.75,159.61 51.31,158.24 50.58,156.49C49.59,154.13 48.14,151.97 46.3,150.15C44.47,148.34 42.28,146.9 39.88,145.91C37.48,144.92 34.9,144.42 32.29,144.42C29.69,144.42 27.11,144.92 24.7,145.91C22.3,146.9 20.12,148.34 18.28,150.15C16.45,151.97 14.99,154.13 14,156.49C13.27,158.24 12.83,159.61 12.63,161.08H51.95ZM56.25,163.17C56.25,160.05 55.63,157.76 54.43,154.88C53.22,152.01 51.46,149.4 49.23,147.19C47.01,144.99 44.37,143.25 41.46,142.05C38.55,140.86 35.44,140.25 32.29,140.25C29.15,140.25 26.03,140.86 23.12,142.05C20.22,143.25 17.58,144.99 15.35,147.19C13.13,149.4 11.36,152.01 10.16,154.88C8.95,157.76 8.33,160.05 8.33,163.17C8.33,164.32 9.27,165.25 10.42,165.25H54.17C55.32,165.25 56.25,164.32 56.25,163.17Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M29.17,79.83C36.88,79.83 43.61,75.64 47.21,69.42H50.36C51.46,69.42 52.52,68.98 53.3,68.2L56.25,65.25L60.16,68.38C60.92,68.98 62,68.98 62.76,68.38L66.67,65.25L69.61,68.2C70.39,68.98 71.45,69.42 72.56,69.42H75.08C76.35,69.42 77.54,68.84 78.33,67.85L84.38,60.3C84.98,59.54 84.98,58.46 84.38,57.7L78.33,50.15C77.54,49.16 76.35,48.58 75.08,48.58H47.21C43.61,42.36 36.88,38.17 29.17,38.17C17.66,38.17 8.33,47.49 8.33,59C8.33,70.51 17.66,79.83 29.17,79.83ZM25,63.17C27.3,63.17 29.17,61.3 29.17,59C29.17,56.7 27.3,54.83 25,54.83C22.7,54.83 20.83,56.7 20.83,59C20.83,61.3 22.7,63.17 25,63.17Z"
-      android:fillColor="#FFBF00"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M44.81,65.25H50.36L55.94,59.67L61.46,64.08L66.98,59.67L72.56,65.25L75.08,65.25L80.08,59L75.08,52.75L44.81,52.75L43.61,50.67C40.72,45.68 35.33,42.33 29.17,42.33C19.96,42.33 12.5,49.8 12.5,59C12.5,68.2 19.96,75.67 29.17,75.67C35.33,75.67 40.72,72.32 43.61,67.33L44.81,65.25ZM81.12,57.7L81.12,57.7L81.12,57.7ZM33.33,59C33.33,63.6 29.6,67.33 25,67.33C20.4,67.33 16.67,63.6 16.67,59C16.67,54.4 20.4,50.67 25,50.67C29.6,50.67 33.33,54.4 33.33,59ZM47.21,69.42C43.61,75.64 36.88,79.83 29.17,79.83C17.66,79.83 8.33,70.51 8.33,59C8.33,47.49 17.66,38.17 29.17,38.17C36.88,38.17 43.61,42.36 47.21,48.58H75.08C76.35,48.58 77.54,49.16 78.33,50.15L84.38,57.7C84.98,58.46 84.98,59.54 84.38,60.3L78.33,67.85C77.54,68.84 76.35,69.42 75.08,69.42H72.56C71.45,69.42 70.39,68.98 69.61,68.2L66.67,65.25L62.76,68.38C62,68.98 60.92,68.98 60.16,68.38L56.25,65.25L53.3,68.2C52.52,68.98 51.46,69.42 50.36,69.42H47.21ZM29.17,59C29.17,61.3 27.3,63.17 25,63.17C22.7,63.17 20.83,61.3 20.83,59C20.83,56.7 22.7,54.83 25,54.83C27.3,54.83 29.17,56.7 29.17,59Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/lock.xml b/app/src/main/res/drawable-night/lock.xml
deleted file mode 100644
index 914b4cf4e6..0000000000
--- a/app/src/main/res/drawable-night/lock.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M16.67,79.83C16.67,66.03 27.86,54.83 41.67,54.83H158.33C172.14,54.83 183.33,66.03 183.33,79.83V159C183.33,172.81 172.14,184 158.33,184H41.67C27.86,184 16.67,172.81 16.67,159V79.83Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M158.33,59H41.67C30.16,59 20.83,68.33 20.83,79.83V159C20.83,170.51 30.16,179.83 41.67,179.83H158.33C169.84,179.83 179.17,170.51 179.17,159V79.83C179.17,68.33 169.84,59 158.33,59ZM41.67,54.83C27.86,54.83 16.67,66.03 16.67,79.83V159C16.67,172.81 27.86,184 41.67,184H158.33C172.14,184 183.33,172.81 183.33,159V79.83C183.33,66.03 172.14,54.83 158.33,54.83H41.67Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M139.58,56.92V42.33C139.58,20.47 121.86,2.75 100,2.75C78.14,2.75 60.42,20.47 60.42,42.33V56.92L72.92,56.92V42.33C72.92,27.38 85.04,15.25 100,15.25C114.96,15.25 127.08,27.38 127.08,42.33V56.92L139.58,56.92Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M58.33,42.33C58.33,19.32 76.99,0.67 100,0.67C123.01,0.67 141.67,19.32 141.67,42.33V59L125,59V42.33C125,28.53 113.81,17.33 100,17.33C86.19,17.33 75,28.53 75,42.33V59L58.33,59V42.33ZM100,4.83C79.29,4.83 62.5,21.62 62.5,42.33V54.83L70.83,54.83V42.33C70.83,26.22 83.89,13.17 100,13.17C116.11,13.17 129.17,26.22 129.17,42.33V54.83L137.5,54.83V42.33C137.5,21.62 120.71,4.83 100,4.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.83,140.25H179.17V156.92H20.83V140.25Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M62.5,46.5H70.83V54.83H62.5V46.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M129.17,46.5H137.5V54.83H129.17V46.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M0,119.42C0,105.61 11.19,94.42 25,94.42H175C188.81,94.42 200,105.61 200,119.42C200,133.22 188.81,144.42 175,144.42H25C11.19,144.42 0,133.22 0,119.42Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M175,98.58H25C13.49,98.58 4.17,107.91 4.17,119.42C4.17,130.92 13.49,140.25 25,140.25H175C186.51,140.25 195.83,130.92 195.83,119.42C195.83,107.91 186.51,98.58 175,98.58ZM25,94.42C11.19,94.42 0,105.61 0,119.42C0,133.22 11.19,144.42 25,144.42H175C188.81,144.42 200,133.22 200,119.42C200,105.61 188.81,94.42 175,94.42H25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M41.67,106.92C42.82,106.92 43.75,107.89 43.75,109.09V117.79L51.54,113.64C52.6,113.08 53.9,113.45 54.44,114.46C54.98,115.48 54.56,116.76 53.5,117.32L45.09,121.79L51.81,129.01C52.63,129.88 52.61,131.23 51.77,132.01C50.93,132.8 49.58,132.72 48.76,131.85L41.67,124.24L34.57,131.85C33.75,132.72 32.41,132.8 31.56,132.01C30.72,131.23 30.7,129.88 31.52,129.01L38.25,121.79L29.83,117.32C28.78,116.76 28.36,115.48 28.9,114.46C29.44,113.45 30.73,113.08 31.79,113.64L39.58,117.79V109.09C39.58,107.89 40.52,106.92 41.67,106.92ZM75,106.92C76.15,106.92 77.08,107.89 77.08,109.09V117.79L84.88,113.64C85.93,113.08 87.23,113.45 87.77,114.46C88.31,115.48 87.89,116.76 86.83,117.32L78.42,121.79L85.15,129.01C85.96,129.88 85.94,131.23 85.1,132.01C84.26,132.8 82.92,132.72 82.1,131.85L75,124.24L67.9,131.85C67.08,132.72 65.74,132.8 64.9,132.01C64.06,131.23 64.04,129.88 64.85,129.01L71.58,121.79L63.17,117.32C62.11,116.76 61.69,115.48 62.23,114.46C62.77,113.45 64.07,113.08 65.12,113.64L72.92,117.79V109.09C72.92,107.89 73.85,106.92 75,106.92ZM110.42,109.09C110.42,107.89 109.48,106.92 108.33,106.92C107.18,106.92 106.25,107.89 106.25,109.09V117.79L98.46,113.64C97.4,113.08 96.1,113.45 95.56,114.46C95.02,115.48 95.44,116.76 96.5,117.32L104.91,121.79L98.19,129.01C97.37,129.88 97.39,131.23 98.23,132.01C99.07,132.8 100.42,132.72 101.23,131.85L108.33,124.24L115.43,131.85C116.25,132.72 117.59,132.8 118.44,132.01C119.28,131.23 119.3,129.88 118.48,129.01L111.75,121.79L120.17,117.32C121.22,116.76 121.64,115.48 121.1,114.46C120.56,113.45 119.27,113.08 118.21,113.64L110.42,117.79V109.09ZM127.08,129.83C127.08,128.68 128.02,127.75 129.17,127.75H145.83C146.98,127.75 147.92,128.68 147.92,129.83C147.92,130.98 146.98,131.92 145.83,131.92H129.17C128.02,131.92 127.08,130.98 127.08,129.83ZM154.17,127.75C153.02,127.75 152.08,128.68 152.08,129.83C152.08,130.98 153.02,131.92 154.17,131.92H170.83C171.98,131.92 172.92,130.98 172.92,129.83C172.92,128.68 171.98,127.75 170.83,127.75H154.17Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/open_email.xml b/app/src/main/res/drawable-night/open_email.xml
deleted file mode 100644
index dd53e3b41b..0000000000
--- a/app/src/main/res/drawable-night/open_email.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M8.33,81.41C8.33,77.77 9.93,74.3 12.69,71.93L93.22,2.84C97.12,-0.51 102.88,-0.51 106.78,2.84L187.31,71.93C190.07,74.3 191.67,77.77 191.67,81.41V184C191.67,188.6 187.94,192.33 183.33,192.33H16.67C12.06,192.33 8.33,188.6 8.33,184V81.41Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M187.5,184V81.41C187.5,78.98 186.44,76.67 184.59,75.09L104.07,6C101.73,3.99 98.27,3.99 95.93,6L15.41,75.09C13.56,76.67 12.5,78.98 12.5,81.41V184C12.5,186.3 14.37,188.17 16.67,188.17H183.33C185.63,188.17 187.5,186.3 187.5,184ZM12.69,71.93C9.93,74.3 8.33,77.77 8.33,81.41V184C8.33,188.6 12.06,192.33 16.67,192.33H183.33C187.94,192.33 191.67,188.6 191.67,184V81.41C191.67,77.77 190.07,74.3 187.31,71.93L106.78,2.84C102.88,-0.51 97.12,-0.51 93.22,2.84L12.69,71.93Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M104.95,136.09C102.01,138.26 97.99,138.26 95.05,136.09L13.74,76.07C12.81,75.39 11.51,75.59 10.82,76.51C10.14,77.44 10.34,78.74 11.26,79.43L92.58,139.44C96.99,142.7 103.01,142.7 107.42,139.44L188.74,79.43C189.66,78.74 189.86,77.44 189.18,76.51C188.49,75.59 187.19,75.39 186.26,76.07L104.95,136.09Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M31.25,23.58H168.75V94.42L102.5,143.6C101.02,144.7 98.99,144.7 97.51,143.59L31.25,93.9V23.58Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M164.58,27.75H35.42V91.81L100.01,140.26L164.58,92.32V27.75ZM168.75,94.42L102.5,143.6C101.02,144.7 98.99,144.7 97.51,143.59L31.25,93.9V23.58H168.75V94.42Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M100,123.58L145.83,149.63L100,175.67L54.17,149.63L100,123.58Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M105.05,127.97C102.07,125.69 97.93,125.69 94.95,127.97L13.76,189.82C12.85,190.52 11.54,190.34 10.84,189.43C10.15,188.51 10.32,187.21 11.24,186.51L92.42,124.65C96.9,121.24 103.1,121.24 107.57,124.65L106.34,126.27L107.57,124.65L188.76,186.51C189.68,187.21 189.85,188.51 189.16,189.43C188.46,190.34 187.15,190.52 186.24,189.82L105.05,127.97Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M175,100.67C175,123.68 156.35,142.33 133.33,142.33C110.32,142.33 91.67,123.68 91.67,100.67C91.67,77.65 110.32,59 133.33,59C156.35,59 175,77.65 175,100.67Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M133.33,138.17C154.04,138.17 170.83,121.38 170.83,100.67C170.83,79.96 154.04,63.17 133.33,63.17C112.62,63.17 95.83,79.96 95.83,100.67C95.83,121.38 112.62,138.17 133.33,138.17ZM133.33,142.33C156.35,142.33 175,123.68 175,100.67C175,77.65 156.35,59 133.33,59C110.32,59 91.67,77.65 91.67,100.67C91.67,123.68 110.32,142.33 133.33,142.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M164.58,100.67C164.58,117.93 150.59,131.92 133.33,131.92C116.07,131.92 102.08,117.93 102.08,100.67C102.08,83.41 116.07,69.42 133.33,69.42C150.59,69.42 164.58,83.41 164.58,100.67Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M197.93,161.26L163.54,128.79L159.38,132.96L191.85,167.34C193.46,169.05 196.16,169.09 197.82,167.43L198.01,167.24C199.67,165.58 199.63,162.88 197.93,161.26Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M45.83,42.33C44.68,42.33 43.75,43.27 43.75,44.42C43.75,45.57 44.68,46.5 45.83,46.5H66.67C67.82,46.5 68.75,45.57 68.75,44.42C68.75,43.27 67.82,42.33 66.67,42.33H45.83ZM137.5,50.67C138.65,50.67 139.58,51.6 139.58,52.75C139.58,53.9 138.65,54.83 137.5,54.83H116.67C115.52,54.83 114.58,53.9 114.58,52.75C114.58,51.6 115.52,50.67 116.67,50.67H137.5ZM138.63,59.33C138.31,59.12 137.92,59 137.5,59H133.33H116.67C115.52,59 114.58,59.93 114.58,61.08C114.58,61.87 115.03,62.56 115.68,62.92C121.04,60.4 127.02,59 133.33,59C135.13,59 136.9,59.11 138.63,59.33ZM94.29,86.08C93.78,87.44 93.34,88.83 92.98,90.25H87.5C86.35,90.25 85.42,89.32 85.42,88.17C85.42,87.02 86.35,86.08 87.5,86.08H94.29ZM98.53,77.75C97.65,79.09 96.84,80.48 96.11,81.92L81.25,81.92C80.1,81.92 79.17,80.98 79.17,79.83C79.17,78.68 80.1,77.75 81.25,77.75L98.53,77.75ZM75,42.33C73.85,42.33 72.92,43.27 72.92,44.42C72.92,45.57 73.85,46.5 75,46.5H95.83C96.98,46.5 97.92,45.57 97.92,44.42C97.92,43.27 96.98,42.33 95.83,42.33H75ZM110.42,52.75C110.42,51.6 109.48,50.67 108.33,50.67H87.5C86.35,50.67 85.42,51.6 85.42,52.75C85.42,53.9 86.35,54.83 87.5,54.83H108.33C109.48,54.83 110.42,53.9 110.42,52.75ZM108.33,63.17C109.48,63.17 110.42,62.23 110.42,61.08C110.42,59.93 109.48,59 108.33,59L83.33,59C82.18,59 81.25,59.93 81.25,61.08C81.25,62.23 82.18,63.17 83.33,63.17L108.33,63.17ZM104.17,42.33C103.02,42.33 102.08,43.27 102.08,44.42C102.08,45.57 103.02,46.5 104.17,46.5H108.33C109.48,46.5 110.42,45.57 110.42,44.42C110.42,43.27 109.48,42.33 108.33,42.33H104.17ZM81.25,52.75C81.25,51.6 80.32,50.67 79.17,50.67H75C73.85,50.67 72.92,51.6 72.92,52.75C72.92,53.9 73.85,54.83 75,54.83H79.17C80.32,54.83 81.25,53.9 81.25,52.75ZM75,63.17C76.15,63.17 77.08,62.23 77.08,61.08C77.08,59.93 76.15,59 75,59H66.67C65.52,59 64.58,59.93 64.58,61.08C64.58,62.23 65.52,63.17 66.67,63.17H75ZM75,79.83C75,80.98 74.07,81.92 72.92,81.92H60.42C59.27,81.92 58.33,80.98 58.33,79.83C58.33,78.68 59.27,77.75 60.42,77.75H72.92C74.07,77.75 75,78.68 75,79.83ZM79.17,90.25C80.32,90.25 81.25,89.32 81.25,88.17C81.25,87.02 80.32,86.08 79.17,86.08H45.83C44.68,86.08 43.75,87.02 43.75,88.17C43.75,89.32 44.68,90.25 45.83,90.25H79.17ZM116.67,42.33C115.52,42.33 114.58,43.27 114.58,44.42C114.58,45.57 115.52,46.5 116.67,46.5L137.5,46.5C138.65,46.5 139.58,45.57 139.58,44.42C139.58,43.27 138.65,42.33 137.5,42.33H116.67ZM68.75,52.75C68.75,51.6 67.82,50.67 66.67,50.67L45.83,50.67C44.68,50.67 43.75,51.6 43.75,52.75C43.75,53.9 44.68,54.83 45.83,54.83L66.67,54.83C67.82,54.83 68.75,53.9 68.75,52.75ZM58.33,63.17C59.48,63.17 60.42,62.23 60.42,61.08C60.42,59.93 59.48,59 58.33,59H45.83C44.68,59 43.75,59.93 43.75,61.08C43.75,62.23 44.68,63.17 45.83,63.17H58.33ZM54.17,79.83C54.17,80.98 53.23,81.92 52.08,81.92H45.83C44.68,81.92 43.75,80.98 43.75,79.83C43.75,78.68 44.68,77.75 45.83,77.75H52.08C53.23,77.75 54.17,78.68 54.17,79.83Z"
-      android:fillColor="#FFBF00"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/pending_requests.xml b/app/src/main/res/drawable-night/pending_requests.xml
deleted file mode 100644
index 670c537d8c..0000000000
--- a/app/src/main/res/drawable-night/pending_requests.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M120.83,81.92C120.83,93.42 111.5,102.75 100,102.75C88.49,102.75 79.17,93.42 79.17,81.92C79.17,70.41 88.49,61.08 100,61.08C111.5,61.08 120.83,70.41 120.83,81.92Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M100,98.58C109.2,98.58 116.67,91.12 116.67,81.92C116.67,72.71 109.2,65.25 100,65.25C90.79,65.25 83.33,72.71 83.33,81.92C83.33,91.12 90.79,98.58 100,98.58ZM100,102.75C111.5,102.75 120.83,93.42 120.83,81.92C120.83,70.41 111.5,61.08 100,61.08C88.49,61.08 79.17,70.41 79.17,81.92C79.17,93.42 88.49,102.75 100,102.75Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M37.5,134C37.5,139.75 32.84,144.42 27.08,144.42C21.33,144.42 16.67,139.75 16.67,134C16.67,128.25 21.33,123.58 27.08,123.58C32.84,123.58 37.5,128.25 37.5,134Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M27.08,140.25C30.53,140.25 33.33,137.45 33.33,134C33.33,130.55 30.53,127.75 27.08,127.75C23.63,127.75 20.83,130.55 20.83,134C20.83,137.45 23.63,140.25 27.08,140.25ZM27.08,144.42C32.84,144.42 37.5,139.75 37.5,134C37.5,128.25 32.84,123.58 27.08,123.58C21.33,123.58 16.67,128.25 16.67,134C16.67,139.75 21.33,144.42 27.08,144.42Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M179.17,117.33C179.17,126.54 171.71,134 162.5,134C153.3,134 145.83,126.54 145.83,117.33C145.83,108.13 153.3,100.67 162.5,100.67C171.71,100.67 179.17,108.13 179.17,117.33Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M162.5,129.83C169.4,129.83 175,124.24 175,117.33C175,110.43 169.4,104.83 162.5,104.83C155.6,104.83 150,110.43 150,117.33C150,124.24 155.6,129.83 162.5,129.83ZM162.5,134C171.71,134 179.17,126.54 179.17,117.33C179.17,108.13 171.71,100.67 162.5,100.67C153.3,100.67 145.83,108.13 145.83,117.33C145.83,126.54 153.3,134 162.5,134Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/vault.xml b/app/src/main/res/drawable-night/vault.xml
deleted file mode 100644
index 635dc06784..0000000000
--- a/app/src/main/res/drawable-night/vault.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M20.83,167.33H50L45.83,188.17H25L20.83,167.33Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M20.83,167.33L25,188.17H45.83L50,167.33H20.83ZM25.92,171.5L28.42,184H42.42L44.92,171.5H25.92Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M150,167.33H179.17L175,188.17H154.17L150,167.33Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M150,167.33L154.17,188.17H175L179.17,167.33H150ZM155.08,171.5L157.58,184H171.58L174.08,171.5H155.08Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M26.04,171.5L27.08,177.75H43.75L44.79,171.5H26.04Z"
-      android:fillColor="#79A1E9"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M155.21,171.5L156.25,177.75H172.92L173.96,171.5H155.21Z"
-      android:fillColor="#79A1E9"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,38.17C0,28.96 7.46,21.5 16.67,21.5H183.33C192.54,21.5 200,28.96 200,38.17V154.83C200,164.04 192.54,171.5 183.33,171.5H16.67C7.46,171.5 0,164.04 0,154.83V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M183.33,25.67H16.67C9.76,25.67 4.17,31.26 4.17,38.17V154.83C4.17,161.74 9.76,167.33 16.67,167.33H183.33C190.24,167.33 195.83,161.74 195.83,154.83V38.17C195.83,31.26 190.24,25.67 183.33,25.67ZM16.67,21.5C7.46,21.5 0,28.96 0,38.17V154.83C0,164.04 7.46,171.5 16.67,171.5H183.33C192.54,171.5 200,164.04 200,154.83V38.17C200,28.96 192.54,21.5 183.33,21.5H16.67Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M16.67,46.5C16.67,41.9 20.4,38.17 25,38.17H175C179.6,38.17 183.33,41.9 183.33,46.5V146.5C183.33,151.1 179.6,154.83 175,154.83H25C20.4,154.83 16.67,151.1 16.67,146.5V46.5Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M175,42.33H25C22.7,42.33 20.83,44.2 20.83,46.5V146.5C20.83,148.8 22.7,150.67 25,150.67H175C177.3,150.67 179.17,148.8 179.17,146.5V46.5C179.17,44.2 177.3,42.33 175,42.33ZM25,38.17C20.4,38.17 16.67,41.9 16.67,46.5V146.5C16.67,151.1 20.4,154.83 25,154.83H175C179.6,154.83 183.33,151.1 183.33,146.5V46.5C183.33,41.9 179.6,38.17 175,38.17H25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M112.5,96.5C112.5,118.36 94.78,136.08 72.92,136.08C51.06,136.08 33.33,118.36 33.33,96.5C33.33,74.64 51.06,56.92 72.92,56.92C94.78,56.92 112.5,74.64 112.5,96.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M91.67,96.5C91.67,106.86 83.27,115.25 72.92,115.25C62.56,115.25 54.17,106.86 54.17,96.5C54.17,86.14 62.56,77.75 72.92,77.75C83.27,77.75 91.67,86.14 91.67,96.5Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M75,63.17C75,62.02 74.07,61.08 72.92,61.08C71.77,61.08 70.83,62.02 70.83,63.17V73.68C66.07,74.11 61.73,75.99 58.25,78.89L50.82,71.46C50.01,70.64 48.69,70.64 47.87,71.46C47.06,72.27 47.06,73.59 47.87,74.4L55.31,81.83C52.41,85.31 50.52,89.65 50.09,94.42H39.58C38.43,94.42 37.5,95.35 37.5,96.5C37.5,97.65 38.43,98.58 39.58,98.58H50.09C50.52,103.35 52.41,107.69 55.31,111.16L47.87,118.6C47.06,119.41 47.06,120.73 47.87,121.54C48.69,122.36 50.01,122.36 50.82,121.54L58.25,114.11C61.73,117.01 66.07,118.89 70.83,119.32V129.83C70.83,130.98 71.77,131.92 72.92,131.92C74.07,131.92 75,130.98 75,129.83V119.32C79.76,118.89 84.11,117.01 87.58,114.11L95.01,121.54C95.83,122.36 97.15,122.36 97.96,121.54C98.77,120.73 98.77,119.41 97.96,118.6L90.53,111.16C93.42,107.69 95.31,103.35 95.74,98.58H106.25C107.4,98.58 108.33,97.65 108.33,96.5C108.33,95.35 107.4,94.42 106.25,94.42H95.74C95.31,89.65 93.42,85.31 90.53,81.83L97.96,74.4C98.77,73.59 98.77,72.27 97.96,71.46C97.15,70.64 95.83,70.64 95.01,71.46L87.58,78.89C84.11,75.99 79.76,74.11 75,73.68V63.17ZM86.17,109.76C82.78,113.15 78.09,115.25 72.92,115.25C62.56,115.25 54.17,106.86 54.17,96.5C54.17,86.14 62.56,77.75 72.92,77.75C78.09,77.75 82.78,79.85 86.17,83.24L86.17,83.24L86.18,83.25C89.57,86.64 91.66,91.32 91.67,96.49L91.67,96.5C91.67,101.68 89.57,106.36 86.18,109.75L86.17,109.76L86.17,109.76ZM81.25,96.5C81.25,101.1 77.52,104.83 72.92,104.83C68.31,104.83 64.58,101.1 64.58,96.5C64.58,91.9 68.31,88.17 72.92,88.17C77.52,88.17 81.25,91.9 81.25,96.5ZM85.42,96.5C85.42,103.4 79.82,109 72.92,109C66.01,109 60.42,103.4 60.42,96.5C60.42,89.6 66.01,84 72.92,84C79.82,84 85.42,89.6 85.42,96.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M172.92,54.83C172.92,52.53 174.78,50.67 177.08,50.67H185.42C187.72,50.67 189.58,52.53 189.58,54.83V75.67C189.58,77.97 187.72,79.83 185.42,79.83H177.08C174.78,79.83 172.92,77.97 172.92,75.67V54.83Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M185.42,54.83H177.08V75.67H185.42V54.83ZM177.08,50.67C174.78,50.67 172.92,52.53 172.92,54.83V75.67C172.92,77.97 174.78,79.83 177.08,79.83H185.42C187.72,79.83 189.58,77.97 189.58,75.67V54.83C189.58,52.53 187.72,50.67 185.42,50.67H177.08Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M172.92,117.33C172.92,115.03 174.78,113.17 177.08,113.17H185.42C187.72,113.17 189.58,115.03 189.58,117.33V138.17C189.58,140.47 187.72,142.33 185.42,142.33H177.08C174.78,142.33 172.92,140.47 172.92,138.17V117.33Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M185.42,117.33H177.08V138.17H185.42V117.33ZM177.08,113.17C174.78,113.17 172.92,115.03 172.92,117.33V138.17C172.92,140.47 174.78,142.33 177.08,142.33H185.42C187.72,142.33 189.58,140.47 189.58,138.17V117.33C189.58,115.03 187.72,113.17 185.42,113.17H177.08Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M177.08,129.83V138.17H185.42V129.83H177.08Z"
-      android:fillColor="#79A1E9"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M177.08,67.33V75.67H185.42V67.33H177.08Z"
-      android:fillColor="#79A1E9"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/welcome_2.xml b/app/src/main/res/drawable-night/welcome_2.xml
deleted file mode 100644
index 8f155e882e..0000000000
--- a/app/src/main/res/drawable-night/welcome_2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M8.33,21.5C8.33,14.6 13.93,9 20.83,9H125C131.9,9 137.5,14.6 137.5,21.5V125.67C137.5,132.57 131.9,138.17 125,138.17H20.83C13.93,138.17 8.33,132.57 8.33,125.67V21.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M125,13.17H20.83C16.23,13.17 12.5,16.9 12.5,21.5V125.67C12.5,130.27 16.23,134 20.83,134H125C129.6,134 133.33,130.27 133.33,125.67V21.5C133.33,16.9 129.6,13.17 125,13.17ZM20.83,9C13.93,9 8.33,14.6 8.33,21.5V125.67C8.33,132.57 13.93,138.17 20.83,138.17H125C131.9,138.17 137.5,132.57 137.5,125.67V21.5C137.5,14.6 131.9,9 125,9H20.83Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M29.17,40.25C29.17,34.5 33.83,29.83 39.58,29.83H54.17C55.32,29.83 56.25,30.77 56.25,31.92C56.25,33.07 55.32,34 54.17,34H39.58C36.13,34 33.33,36.8 33.33,40.25V54.83C33.33,55.98 32.4,56.92 31.25,56.92C30.1,56.92 29.17,55.98 29.17,54.83V40.25ZM89.58,31.92C89.58,30.77 90.52,29.83 91.67,29.83H106.25C112,29.83 116.67,34.5 116.67,40.25V54.83C116.67,55.98 115.73,56.92 114.58,56.92C113.43,56.92 112.5,55.98 112.5,54.83V40.25C112.5,36.8 109.7,34 106.25,34H91.67C90.52,34 89.58,33.07 89.58,31.92ZM31.25,90.25C32.4,90.25 33.33,91.18 33.33,92.33V106.92C33.33,110.37 36.13,113.17 39.58,113.17H54.17C55.32,113.17 56.25,114.1 56.25,115.25C56.25,116.4 55.32,117.33 54.17,117.33H39.58C33.83,117.33 29.17,112.67 29.17,106.92V92.33C29.17,91.18 30.1,90.25 31.25,90.25ZM114.58,90.25C115.73,90.25 116.67,91.18 116.67,92.33V106.92C116.67,112.67 112,117.33 106.25,117.33H91.67C90.52,117.33 89.58,116.4 89.58,115.25C89.58,114.1 90.52,113.17 91.67,113.17H106.25C109.7,113.17 112.5,110.37 112.5,106.92V92.33C112.5,91.18 113.43,90.25 114.58,90.25ZM54.17,56.92C55.32,56.92 56.25,57.85 56.25,59V69.42C56.25,70.57 55.32,71.5 54.17,71.5C53.02,71.5 52.08,70.57 52.08,69.42V59C52.08,57.85 53.02,56.92 54.17,56.92ZM77.08,56.92C77.08,55.77 76.15,54.83 75,54.83C73.85,54.83 72.92,55.77 72.92,56.92V77.75C72.92,78.9 71.98,79.83 70.83,79.83H66.67C65.52,79.83 64.58,80.77 64.58,81.92C64.58,83.07 65.52,84 66.67,84H70.83C74.28,84 77.08,81.2 77.08,77.75V56.92ZM72.92,96.5C68.26,96.5 63.73,95.17 59.39,92.62C58.39,92.04 57.12,92.37 56.54,93.36C55.95,94.35 56.29,95.63 57.28,96.21C62.18,99.09 67.43,100.67 72.92,100.67C78.4,100.67 83.66,99.09 88.55,96.21C89.55,95.63 89.88,94.35 89.3,93.36C88.71,92.37 87.44,92.04 86.44,92.62C82.11,95.17 77.57,96.5 72.92,96.5ZM49.09,52.39C50.79,51.23 52.48,50.67 54.17,50.67C55.85,50.67 57.54,51.23 59.24,52.39C60.19,53.04 61.49,52.79 62.13,51.84C62.79,50.89 62.54,49.6 61.59,48.95C59.33,47.4 56.83,46.5 54.17,46.5C51.5,46.5 49,47.4 46.74,48.95C45.79,49.6 45.55,50.89 46.2,51.84C46.85,52.79 48.14,53.04 49.09,52.39ZM91.67,50.67C89.98,50.67 88.29,51.23 86.59,52.39C85.64,53.04 84.35,52.79 83.7,51.84C83.05,50.89 83.29,49.6 84.24,48.95C86.5,47.4 89,46.5 91.67,46.5C94.33,46.5 96.83,47.4 99.09,48.95C100.04,49.6 100.29,50.89 99.64,51.84C98.99,52.79 97.69,53.04 96.74,52.39C95.04,51.23 93.35,50.67 91.67,50.67ZM93.75,59C93.75,57.85 92.82,56.92 91.67,56.92C90.52,56.92 89.58,57.85 89.58,59V69.42C89.58,70.57 90.52,71.5 91.67,71.5C92.82,71.5 93.75,70.57 93.75,69.42V59Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M191.67,128.79C191.67,163.88 168.35,192.33 139.58,192.33C110.82,192.33 87.5,163.88 87.5,128.79C87.5,93.7 110.82,65.25 139.58,65.25C168.35,65.25 191.67,93.7 191.67,128.79Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M139.58,188.17C165.31,188.17 187.5,162.4 187.5,128.79C187.5,95.19 165.31,69.42 139.58,69.42C113.86,69.42 91.67,95.19 91.67,128.79C91.67,162.4 113.86,188.17 139.58,188.17ZM139.58,192.33C168.35,192.33 191.67,163.88 191.67,128.79C191.67,93.7 168.35,65.25 139.58,65.25C110.82,65.25 87.5,93.7 87.5,128.79C87.5,163.88 110.82,192.33 139.58,192.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125.73,103.16C130.04,101.55 134.71,100.67 139.59,100.67C144.46,100.67 149.13,101.55 153.44,103.16C154.52,103.56 155.72,103.01 156.12,101.94C156.52,100.86 155.98,99.66 154.9,99.26C150.13,97.47 144.97,96.5 139.59,96.5C134.2,96.5 129.04,97.47 124.27,99.26C123.2,99.66 122.65,100.86 123.05,101.94C123.45,103.01 124.65,103.56 125.73,103.16ZM139.59,109C130.04,109 121.57,113.58 116.25,120.67C115.56,121.59 114.25,121.77 113.33,121.08C112.41,120.39 112.23,119.08 112.92,118.17C119,110.07 128.68,104.83 139.59,104.83C150.41,104.83 159.45,109.26 166.06,115.86C166.88,116.67 166.88,117.99 166.06,118.81C165.25,119.62 163.93,119.62 163.12,118.81C157.21,112.91 149.21,109 139.59,109ZM139.29,113.17C125.85,113.17 115.22,124.56 116.14,137.97L116.33,140.67C116.57,144.17 117.4,147.6 118.78,150.82L119.96,153.57C120.41,154.63 121.64,155.12 122.69,154.66C123.75,154.21 124.24,152.99 123.79,151.93L122.61,149.18C121.42,146.39 120.7,143.41 120.49,140.38L120.3,137.68C119.54,126.68 128.26,117.33 139.29,117.33C149.81,117.33 158.33,125.86 158.33,136.37V138.17C158.33,139.32 157.4,140.25 156.25,140.25C155.1,140.25 154.17,139.32 154.17,138.17V136.08C154.17,132.73 152.96,129.09 150.36,126.26C147.73,123.4 143.77,121.5 138.54,121.5C133.11,121.5 129.6,123.97 127.55,127.14C125.57,130.18 125,133.73 125,136.08C125,141.9 125.52,146.14 126.98,149.65C128.47,153.21 130.83,155.81 134.08,158.52C134.97,159.25 136.28,159.13 137.02,158.25C137.75,157.37 137.63,156.05 136.75,155.32C133.75,152.82 131.95,150.73 130.83,148.04C129.69,145.3 129.17,141.72 129.17,136.08C129.17,134.27 129.63,131.57 131.04,129.41C132.37,127.36 134.6,125.67 138.54,125.67C142.69,125.67 145.5,127.14 147.29,129.09C149.13,131.07 150,133.68 150,136.08V138.17C150,141.62 152.8,144.42 156.25,144.42C159.7,144.42 162.5,141.62 162.5,138.17V136.37C162.5,123.56 152.11,113.17 139.29,113.17ZM137.41,135.96C137.41,134.91 138.28,134 139.47,134C140.68,134 141.67,134.99 141.67,136.2V139.61C141.67,143.29 143.4,146.76 146.35,148.97L148.06,150.25C150.22,151.87 152.85,152.75 155.56,152.75H156.25C157.4,152.75 158.33,151.82 158.33,150.67C158.33,149.52 157.4,148.58 156.25,148.58H155.56C153.75,148.58 152,148 150.56,146.92L148.85,145.63C146.95,144.21 145.83,141.98 145.83,139.61V136.2C145.83,132.68 142.98,129.83 139.47,129.83C136.11,129.83 133.24,132.47 133.24,135.96C133.24,138.01 133.32,140.59 133.61,142.98C133.92,145.56 135.18,147.6 136.52,149.29C137.13,150.06 137.79,150.81 138.41,151.51L138.58,151.69C139.26,152.46 139.89,153.18 140.46,153.93C141.84,155.75 142.21,157.24 141.82,158.23C141.39,159.29 141.91,160.51 142.98,160.93C144.04,161.36 145.26,160.84 145.68,159.77C146.94,156.63 145.34,153.48 143.78,151.41C143.1,150.52 142.37,149.69 141.69,148.93L141.54,148.76C140.9,148.04 140.32,147.38 139.79,146.71C138.65,145.27 137.93,143.96 137.75,142.48C137.49,140.32 137.41,137.93 137.41,135.96Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/welcome_3.xml b/app/src/main/res/drawable-night/welcome_3.xml
deleted file mode 100644
index 0238feb373..0000000000
--- a/app/src/main/res/drawable-night/welcome_3.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M164.58,100.67C164.58,136.34 135.67,165.25 100,165.25C64.33,165.25 35.42,136.34 35.42,100.67C35.42,65 64.33,36.08 100,36.08C135.67,36.08 164.58,65 164.58,100.67Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M100,38.17C65.48,38.17 37.5,66.15 37.5,100.67C37.5,135.18 65.48,163.17 100,163.17C134.52,163.17 162.5,135.18 162.5,100.67C162.5,66.15 134.52,38.17 100,38.17ZM33.33,100.67C33.33,63.85 63.18,34 100,34C136.82,34 166.67,63.85 166.67,100.67C166.67,137.49 136.82,167.33 100,167.33C63.18,167.33 33.33,137.49 33.33,100.67Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,100.67C0,86.86 11.19,75.67 25,75.67H175C188.81,75.67 200,86.86 200,100.67C200,114.47 188.81,125.67 175,125.67H25C11.19,125.67 0,114.47 0,100.67Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M175,79.83H25C13.49,79.83 4.17,89.16 4.17,100.67C4.17,112.17 13.49,121.5 25,121.5H175C186.51,121.5 195.83,112.17 195.83,100.67C195.83,89.16 186.51,79.83 175,79.83ZM25,75.67C11.19,75.67 0,86.86 0,100.67C0,114.47 11.19,125.67 25,125.67H175C188.81,125.67 200,114.47 200,100.67C200,86.86 188.81,75.67 175,75.67H25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M41.67,88.17C42.82,88.17 43.75,89.14 43.75,90.34V99.04L51.54,94.89C52.6,94.33 53.9,94.7 54.44,95.71C54.98,96.73 54.56,98.01 53.5,98.57L45.09,103.04L51.81,110.26C52.63,111.13 52.61,112.48 51.77,113.26C50.93,114.05 49.58,113.97 48.76,113.1L41.67,105.49L34.57,113.1C33.75,113.97 32.41,114.05 31.56,113.26C30.72,112.48 30.7,111.13 31.52,110.26L38.25,103.04L29.83,98.57C28.78,98.01 28.36,96.73 28.9,95.71C29.44,94.7 30.73,94.33 31.79,94.89L39.58,99.04V90.34C39.58,89.14 40.52,88.17 41.67,88.17ZM75,88.17C76.15,88.17 77.08,89.14 77.08,90.34V99.04L84.88,94.89C85.93,94.33 87.23,94.7 87.77,95.71C88.31,96.73 87.89,98.01 86.83,98.57L78.42,103.04L85.15,110.26C85.96,111.13 85.94,112.48 85.1,113.26C84.26,114.05 82.92,113.97 82.1,113.1L75,105.49L67.9,113.1C67.08,113.97 65.74,114.05 64.9,113.26C64.06,112.48 64.04,111.13 64.85,110.26L71.58,103.04L63.17,98.57C62.11,98.01 61.69,96.73 62.23,95.71C62.77,94.7 64.07,94.33 65.12,94.89L72.92,99.04V90.34C72.92,89.14 73.85,88.17 75,88.17ZM110.42,90.34C110.42,89.14 109.48,88.17 108.33,88.17C107.18,88.17 106.25,89.14 106.25,90.34V99.04L98.46,94.89C97.4,94.33 96.1,94.7 95.56,95.71C95.02,96.73 95.44,98.01 96.5,98.57L104.91,103.04L98.19,110.26C97.37,111.13 97.39,112.48 98.23,113.26C99.07,114.05 100.42,113.97 101.23,113.1L108.33,105.49L115.43,113.1C116.25,113.97 117.59,114.05 118.44,113.26C119.28,112.48 119.3,111.13 118.48,110.26L111.75,103.04L120.17,98.57C121.22,98.01 121.64,96.73 121.1,95.71C120.56,94.7 119.27,94.33 118.21,94.89L110.42,99.04V90.34ZM127.08,111.08C127.08,109.93 128.02,109 129.17,109H145.83C146.98,109 147.92,109.93 147.92,111.08C147.92,112.23 146.98,113.17 145.83,113.17H129.17C128.02,113.17 127.08,112.23 127.08,111.08ZM154.17,109C153.02,109 152.08,109.93 152.08,111.08C152.08,112.23 153.02,113.17 154.17,113.17H170.83C171.98,113.17 172.92,112.23 172.92,111.08C172.92,109.93 171.98,109 170.83,109H154.17Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M121.51,191.91C145.69,186.21 165.45,171.63 178.16,152.43C178.8,151.47 180.09,151.21 181.05,151.85C182.01,152.48 182.27,153.77 181.64,154.73C168.37,174.78 147.72,190.02 122.47,195.97C81.49,205.63 40.46,188 18.44,154.89C17.8,153.93 18.06,152.64 19.02,152C19.98,151.36 21.27,151.62 21.91,152.58C42.99,184.29 82.28,201.16 121.51,191.91ZM180.98,49.33C180.02,49.97 178.73,49.71 178.1,48.75C157.01,17.04 117.72,0.17 78.49,9.42C52.81,15.47 32.11,31.55 19.55,52.53C18.96,53.52 17.68,53.84 16.69,53.25C15.71,52.66 15.39,51.38 15.98,50.39C29.09,28.48 50.71,11.69 77.53,5.36C118.51,-4.3 159.54,13.33 181.56,46.44C182.2,47.4 181.94,48.7 180.98,49.33Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M50,152.75C50,151.6 49.07,150.67 47.92,150.67L18.75,150.67C17.6,150.67 16.67,151.6 16.67,152.75L16.67,181.92C16.67,183.07 17.6,184 18.75,184C19.9,184 20.83,183.07 20.83,181.92L20.83,154.83L47.92,154.83C49.07,154.83 50,153.9 50,152.75Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M150,48.58C150,49.73 150.93,50.67 152.08,50.67L181.25,50.67C182.4,50.67 183.33,49.73 183.33,48.58L183.33,19.42C183.33,18.27 182.4,17.33 181.25,17.33C180.1,17.33 179.17,18.27 179.17,19.42L179.17,46.5L152.08,46.5C150.93,46.5 150,47.43 150,48.58Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M47.12,134C45.45,131.35 43.97,128.57 42.7,125.67H157.3C156.03,128.57 154.55,131.35 152.88,134H47.12Z"
-      android:fillColor="#99BAF4"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable-night/welcome_4.xml b/app/src/main/res/drawable-night/welcome_4.xml
deleted file mode 100644
index a2fa9ef7a0..0000000000
--- a/app/src/main/res/drawable-night/welcome_4.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="200dp"
-    android:height="201dp"
-    android:viewportWidth="200"
-    android:viewportHeight="201">
-  <path
-      android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M100,115.25C118.41,115.25 133.33,100.33 133.33,81.92C133.33,63.51 118.41,48.58 100,48.58C81.59,48.58 66.67,63.51 66.67,81.92C66.67,100.33 81.59,115.25 100,115.25ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M79.17,75.67C79.17,72.21 81.96,69.42 85.42,69.42H114.58C118.03,69.42 120.83,72.21 120.83,75.67V96.5C120.83,99.95 118.03,102.75 114.58,102.75H85.42C81.96,102.75 79.17,99.95 79.17,96.5V75.67Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M114.58,73.58H85.42C84.27,73.58 83.33,74.52 83.33,75.67V96.5C83.33,97.65 84.27,98.58 85.42,98.58H114.58C115.73,98.58 116.67,97.65 116.67,96.5V75.67C116.67,74.52 115.73,73.58 114.58,73.58ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M97.92,81.92C97.92,80.77 98.85,79.83 100,79.83C101.15,79.83 102.08,80.77 102.08,81.92V90.25C102.08,91.4 101.15,92.33 100,92.33C98.85,92.33 97.92,91.4 97.92,90.25V81.92Z"
-      android:fillColor="#175DDC"/>
-  <path
-      android:pathData="M89.58,67.33C89.58,61.58 94.25,56.92 100,56.92C105.75,56.92 110.42,61.58 110.42,67.33V69.42H106.25V67.33C106.25,63.88 103.45,61.08 100,61.08C96.55,61.08 93.75,63.88 93.75,67.33V69.42H89.58V67.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z"
-      android:fillColor="#F3F6F9"/>
-  <path
-      android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z"
-      android:fillColor="#79A1E9"/>
-  <path
-      android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z"
-      android:fillColor="#79A1E9"/>
-</vector>
diff --git a/app/src/main/res/drawable/account_setup.xml b/app/src/main/res/drawable/account_setup.xml
index 2f54541443..1374650edf 100644
--- a/app/src/main/res/drawable/account_setup.xml
+++ b/app/src/main/res/drawable/account_setup.xml
@@ -3,49 +3,61 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M8.33,21.5C8.33,14.6 13.93,9 20.83,9H87.5C94.4,9 100,14.6 100,21.5V163.17C100,170.07 94.4,175.67 87.5,175.67H20.83C13.93,175.67 8.33,170.07 8.33,163.17V21.5Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M87.5,13.17H20.83C16.23,13.17 12.5,16.9 12.5,21.5V163.17C12.5,167.77 16.23,171.5 20.83,171.5H87.5C92.1,171.5 95.83,167.77 95.83,163.17V21.5C95.83,16.9 92.1,13.17 87.5,13.17ZM20.83,9C13.93,9 8.33,14.6 8.33,21.5V163.17C8.33,170.07 13.93,175.67 20.83,175.67H87.5C94.4,175.67 100,170.07 100,163.17V21.5C100,14.6 94.4,9 87.5,9H20.83Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M45.83,23.58C45.83,22.43 46.77,21.5 47.92,21.5H60.42C61.57,21.5 62.5,22.43 62.5,23.58C62.5,24.73 61.57,25.67 60.42,25.67H47.92C46.77,25.67 45.83,24.73 45.83,23.58Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M91.67,96.5C91.67,121.81 74.88,142.33 54.17,142.33C33.46,142.33 16.67,121.81 16.67,96.5C16.67,71.19 33.46,50.67 54.17,50.67C74.88,50.67 91.67,71.19 91.67,96.5Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M54.17,138.17C71.83,138.17 87.5,120.33 87.5,96.5C87.5,72.67 71.83,54.83 54.17,54.83C36.5,54.83 20.83,72.67 20.83,96.5C20.83,120.33 36.5,138.17 54.17,138.17ZM54.17,142.33C74.88,142.33 91.67,121.81 91.67,96.5C91.67,71.19 74.88,50.67 54.17,50.67C33.46,50.67 16.67,71.19 16.67,96.5C16.67,121.81 33.46,142.33 54.17,142.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M170.83,88.17C170.83,104.28 157.77,117.33 141.67,117.33C125.56,117.33 112.5,104.28 112.5,88.17C112.5,72.06 125.56,59 141.67,59C157.77,59 170.83,72.06 170.83,88.17Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M141.67,113.17C155.47,113.17 166.67,101.97 166.67,88.17C166.67,74.36 155.47,63.17 141.67,63.17C127.86,63.17 116.67,74.36 116.67,88.17C116.67,101.97 127.86,113.17 141.67,113.17ZM141.67,117.33C157.77,117.33 170.83,104.28 170.83,88.17C170.83,72.06 157.77,59 141.67,59C125.56,59 112.5,72.06 112.5,88.17C112.5,104.28 125.56,117.33 141.67,117.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M195.64,150.62C197.58,155.31 198.89,160.23 199.53,165.25H104.17V144.42H92.79C95.35,139.89 98.51,135.72 102.2,132.03C107.52,126.71 113.83,122.49 120.78,119.61C127.73,116.73 135.18,115.25 142.71,115.25C150.23,115.25 157.68,116.73 164.63,119.61C171.58,122.49 177.9,126.71 183.22,132.03C188.54,137.35 192.76,143.67 195.64,150.62Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M108.33,140.25V161.08H194.58C193.91,158.06 192.98,155.09 191.79,152.21C189.12,145.77 185.21,139.91 180.27,134.98C175.34,130.04 169.48,126.13 163.04,123.46C156.59,120.79 149.68,119.42 142.71,119.42C135.73,119.42 128.82,120.79 122.38,123.46C115.93,126.13 110.08,130.04 105.14,134.98C103.49,136.63 101.94,138.4 100.52,140.25H108.33ZM95.38,140.25C94.46,141.6 93.6,142.99 92.79,144.42H104.17V165.25H199.53C199.35,163.85 199.12,162.46 198.84,161.08C198.11,157.51 197.04,154 195.64,150.62C192.76,143.67 188.54,137.35 183.22,132.03C177.9,126.71 171.58,122.49 164.63,119.61C157.68,116.73 150.23,115.25 142.71,115.25C135.18,115.25 127.73,116.73 120.78,119.61C113.83,122.49 107.52,126.71 102.2,132.03C99.67,134.56 97.39,137.31 95.38,140.25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M97.92,198.58C111.1,198.58 122.49,190.93 127.9,179.83H142.02C143.13,179.83 144.19,179.39 144.97,178.61L150,173.58L154.78,178.36C155.59,179.17 156.91,179.17 157.72,178.36L159.38,176.71L161.03,178.36C161.84,179.17 163.16,179.17 163.97,178.36L168.75,173.58L173.78,178.61C174.56,179.39 175.62,179.83 176.73,179.83H183.69C184.8,179.83 185.86,179.39 186.64,178.61L199.26,165.99C199.67,165.58 199.67,164.92 199.26,164.51L186.64,151.89C185.86,151.1 184.8,150.67 183.69,150.67H127.9C122.49,139.57 111.1,131.92 97.92,131.92C79.51,131.92 64.58,146.84 64.58,165.25C64.58,183.66 79.51,198.58 97.92,198.58ZM85.42,171.5C88.87,171.5 91.67,168.7 91.67,165.25C91.67,161.8 88.87,159 85.42,159C81.97,159 79.17,161.8 79.17,165.25C79.17,168.7 81.97,171.5 85.42,171.5Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125.29,175.67H142.02L150,167.69L156.25,173.94L159.38,170.82L162.5,173.94L168.75,167.69L176.73,175.67H183.69L194.11,165.25L183.69,154.83L125.29,154.83L124.15,152.49C119.42,142.77 109.44,136.08 97.92,136.08C81.81,136.08 68.75,149.14 68.75,165.25C68.75,181.36 81.81,194.42 97.92,194.42C109.44,194.42 119.42,187.73 124.15,178.01L125.29,175.67ZM199.26,165.99C199.67,165.58 199.67,164.92 199.26,164.51L186.64,151.89C185.86,151.1 184.8,150.67 183.69,150.67H127.9C122.49,139.57 111.1,131.92 97.92,131.92C79.51,131.92 64.58,146.84 64.58,165.25C64.58,183.66 79.51,198.58 97.92,198.58C111.1,198.58 122.49,190.93 127.9,179.83H142.02C143.13,179.83 144.19,179.39 144.97,178.61L150,173.58L154.78,178.36C155.59,179.17 156.91,179.17 157.72,178.36C157.72,178.36 157.72,178.36 157.72,178.36L159.38,176.71L161.03,178.36C161.03,178.36 161.03,178.36 161.03,178.36C161.84,179.17 163.16,179.17 163.97,178.36L168.75,173.58L173.78,178.61C174.56,179.39 175.62,179.83 176.73,179.83H183.69C184.8,179.83 185.86,179.39 186.64,178.61L199.26,165.99ZM95.83,165.25C95.83,171 91.17,175.67 85.42,175.67C79.66,175.67 75,171 75,165.25C75,159.5 79.66,154.83 85.42,154.83C91.17,154.83 95.83,159.5 95.83,165.25ZM91.67,165.25C91.67,168.7 88.87,171.5 85.42,171.5C81.97,171.5 79.17,168.7 79.17,165.25C79.17,161.8 81.97,159 85.42,159C88.87,159 91.67,161.8 91.67,165.25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M40.32,71.91C44.63,70.3 49.29,69.42 54.17,69.42C59.05,69.42 63.71,70.3 68.02,71.91C69.1,72.31 70.3,71.76 70.7,70.69C71.11,69.61 70.56,68.41 69.48,68.01C64.71,66.22 59.55,65.25 54.17,65.25C48.79,65.25 43.63,66.22 38.86,68.01C37.78,68.41 37.23,69.61 37.64,70.69C38.04,71.76 39.24,72.31 40.32,71.91ZM54.17,77.75C44.63,77.75 36.16,82.33 30.83,89.42C30.14,90.34 28.84,90.52 27.92,89.83C27,89.14 26.81,87.84 27.5,86.92C33.58,78.82 43.26,73.58 54.17,73.58C65,73.58 74.04,78.01 80.64,84.61C81.46,85.42 81.46,86.74 80.65,87.56C79.83,88.37 78.51,88.37 77.7,87.56C71.8,81.66 63.79,77.75 54.17,77.75ZM53.88,81.92C40.43,81.92 29.8,93.31 30.73,106.72L30.92,109.42C31.16,112.92 31.98,116.35 33.36,119.57L34.54,122.32C34.99,123.38 36.22,123.87 37.28,123.42C38.33,122.96 38.82,121.74 38.37,120.68L37.2,117.93C36,115.14 35.28,112.17 35.07,109.13L34.89,106.43C34.13,95.43 42.85,86.08 53.88,86.08C64.39,86.08 72.92,94.61 72.92,105.12V106.92C72.92,108.07 71.98,109 70.83,109C69.68,109 68.75,108.07 68.75,106.92V104.83C68.75,101.48 67.54,97.84 64.95,95.02C62.31,92.15 58.35,90.25 53.13,90.25C47.69,90.25 44.19,92.72 42.13,95.89C40.16,98.92 39.58,102.48 39.58,104.83C39.58,110.65 40.11,114.89 41.57,118.39C43.05,121.96 45.42,124.56 48.67,127.27C49.55,128 50.86,127.88 51.6,127C52.34,126.12 52.22,124.8 51.33,124.07C48.33,121.57 46.53,119.48 45.41,116.79C44.27,114.05 43.75,110.47 43.75,104.83C43.75,103.02 44.22,100.32 45.63,98.16C46.96,96.11 49.18,94.42 53.13,94.42C57.27,94.42 60.09,95.89 61.88,97.84C63.71,99.83 64.58,102.43 64.58,104.83V106.92C64.58,110.37 67.38,113.17 70.83,113.17C74.29,113.17 77.08,110.37 77.08,106.92V105.12C77.08,92.31 66.69,81.92 53.88,81.92ZM51.99,104.71C51.99,103.66 52.86,102.75 54.05,102.75C55.27,102.75 56.25,103.74 56.25,104.95V108.36C56.25,112.04 57.98,115.51 60.93,117.72L62.64,119C64.8,120.62 67.43,121.5 70.14,121.5H70.83C71.98,121.5 72.92,120.57 72.92,119.42C72.92,118.27 71.98,117.33 70.83,117.33H70.14C68.34,117.33 66.58,116.75 65.14,115.67L63.43,114.39C61.53,112.96 60.42,110.73 60.42,108.36V104.95C60.42,101.43 57.57,98.58 54.05,98.58C50.7,98.58 47.82,101.22 47.83,104.71C47.83,106.76 47.91,109.34 48.19,111.72C48.51,114.31 49.76,116.35 51.1,118.04C51.71,118.81 52.38,119.56 53,120.26L53.16,120.44C53.84,121.21 54.48,121.93 55.04,122.68C56.42,124.5 56.79,125.99 56.4,126.98C55.97,128.04 56.49,129.26 57.56,129.68C58.63,130.11 59.84,129.59 60.27,128.52C61.53,125.38 59.93,122.22 58.36,120.16C57.69,119.27 56.96,118.44 56.28,117.68L56.12,117.51C55.49,116.79 54.9,116.13 54.37,115.46C53.23,114.02 52.51,112.71 52.33,111.23C52.07,109.07 52,106.68 51.99,104.71Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M8.33,21.5C8.33,14.6 13.93,9 20.83,9H87.5C94.4,9 100,14.6 100,21.5V163.17C100,170.07 94.4,175.67 87.5,175.67H20.83C13.93,175.67 8.33,170.07 8.33,163.17V21.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M87.5,13.17H20.83C16.23,13.17 12.5,16.9 12.5,21.5V163.17C12.5,167.77 16.23,171.5 20.83,171.5H87.5C92.1,171.5 95.83,167.77 95.83,163.17V21.5C95.83,16.9 92.1,13.17 87.5,13.17ZM20.83,9C13.93,9 8.33,14.6 8.33,21.5V163.17C8.33,170.07 13.93,175.67 20.83,175.67H87.5C94.4,175.67 100,170.07 100,163.17V21.5C100,14.6 94.4,9 87.5,9H20.83Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M45.83,23.58C45.83,22.43 46.77,21.5 47.92,21.5H60.42C61.57,21.5 62.5,22.43 62.5,23.58C62.5,24.73 61.57,25.67 60.42,25.67H47.92C46.77,25.67 45.83,24.73 45.83,23.58Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M91.67,96.5C91.67,121.81 74.88,142.33 54.17,142.33C33.46,142.33 16.67,121.81 16.67,96.5C16.67,71.19 33.46,50.67 54.17,50.67C74.88,50.67 91.67,71.19 91.67,96.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M54.17,138.17C71.83,138.17 87.5,120.33 87.5,96.5C87.5,72.67 71.83,54.83 54.17,54.83C36.5,54.83 20.83,72.67 20.83,96.5C20.83,120.33 36.5,138.17 54.17,138.17ZM54.17,142.33C74.88,142.33 91.67,121.81 91.67,96.5C91.67,71.19 74.88,50.67 54.17,50.67C33.46,50.67 16.67,71.19 16.67,96.5C16.67,121.81 33.46,142.33 54.17,142.33Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M170.83,88.17C170.83,104.28 157.77,117.33 141.67,117.33C125.56,117.33 112.5,104.28 112.5,88.17C112.5,72.06 125.56,59 141.67,59C157.77,59 170.83,72.06 170.83,88.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M141.67,113.17C155.47,113.17 166.67,101.97 166.67,88.17C166.67,74.36 155.47,63.17 141.67,63.17C127.86,63.17 116.67,74.36 116.67,88.17C116.67,101.97 127.86,113.17 141.67,113.17ZM141.67,117.33C157.77,117.33 170.83,104.28 170.83,88.17C170.83,72.06 157.77,59 141.67,59C125.56,59 112.5,72.06 112.5,88.17C112.5,104.28 125.56,117.33 141.67,117.33Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:pathData="M195.64,150.62C197.58,155.31 198.89,160.23 199.53,165.25H104.17V144.42H92.79C95.35,139.89 98.51,135.72 102.2,132.03C107.52,126.71 113.83,122.49 120.78,119.61C127.73,116.73 135.18,115.25 142.71,115.25C150.23,115.25 157.68,116.73 164.63,119.61C171.58,122.49 177.9,126.71 183.22,132.03C188.54,137.35 192.76,143.67 195.64,150.62Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M108.33,140.25V161.08H194.58C193.91,158.06 192.98,155.09 191.79,152.21C189.12,145.77 185.21,139.91 180.27,134.98C175.34,130.04 169.48,126.13 163.04,123.46C156.59,120.79 149.68,119.42 142.71,119.42C135.73,119.42 128.82,120.79 122.38,123.46C115.93,126.13 110.08,130.04 105.14,134.98C103.49,136.63 101.94,138.4 100.52,140.25H108.33ZM95.38,140.25C94.46,141.6 93.6,142.99 92.79,144.42H104.17V165.25H199.53C199.35,163.85 199.12,162.46 198.84,161.08C198.11,157.51 197.04,154 195.64,150.62C192.76,143.67 188.54,137.35 183.22,132.03C177.9,126.71 171.58,122.49 164.63,119.61C157.68,116.73 150.23,115.25 142.71,115.25C135.18,115.25 127.73,116.73 120.78,119.61C113.83,122.49 107.52,126.71 102.2,132.03C99.67,134.56 97.39,137.31 95.38,140.25Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        android:pathData="M97.92,198.58C111.1,198.58 122.49,190.93 127.9,179.83H142.02C143.13,179.83 144.19,179.39 144.97,178.61L150,173.58L154.78,178.36C155.59,179.17 156.91,179.17 157.72,178.36L159.38,176.71L161.03,178.36C161.84,179.17 163.16,179.17 163.97,178.36L168.75,173.58L173.78,178.61C174.56,179.39 175.62,179.83 176.73,179.83H183.69C184.8,179.83 185.86,179.39 186.64,178.61L199.26,165.99C199.67,165.58 199.67,164.92 199.26,164.51L186.64,151.89C185.86,151.1 184.8,150.67 183.69,150.67H127.9C122.49,139.57 111.1,131.92 97.92,131.92C79.51,131.92 64.58,146.84 64.58,165.25C64.58,183.66 79.51,198.58 97.92,198.58ZM85.42,171.5C88.87,171.5 91.67,168.7 91.67,165.25C91.67,161.8 88.87,159 85.42,159C81.97,159 79.17,161.8 79.17,165.25C79.17,168.7 81.97,171.5 85.42,171.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M125.29,175.67H142.02L150,167.69L156.25,173.94L159.38,170.82L162.5,173.94L168.75,167.69L176.73,175.67H183.69L194.11,165.25L183.69,154.83L125.29,154.83L124.15,152.49C119.42,142.77 109.44,136.08 97.92,136.08C81.81,136.08 68.75,149.14 68.75,165.25C68.75,181.36 81.81,194.42 97.92,194.42C109.44,194.42 119.42,187.73 124.15,178.01L125.29,175.67ZM199.26,165.99C199.67,165.58 199.67,164.92 199.26,164.51L186.64,151.89C185.86,151.1 184.8,150.67 183.69,150.67H127.9C122.49,139.57 111.1,131.92 97.92,131.92C79.51,131.92 64.58,146.84 64.58,165.25C64.58,183.66 79.51,198.58 97.92,198.58C111.1,198.58 122.49,190.93 127.9,179.83H142.02C143.13,179.83 144.19,179.39 144.97,178.61L150,173.58L154.78,178.36C155.59,179.17 156.91,179.17 157.72,178.36C157.72,178.36 157.72,178.36 157.72,178.36L159.38,176.71L161.03,178.36C161.03,178.36 161.03,178.36 161.03,178.36C161.84,179.17 163.16,179.17 163.97,178.36L168.75,173.58L173.78,178.61C174.56,179.39 175.62,179.83 176.73,179.83H183.69C184.8,179.83 185.86,179.39 186.64,178.61L199.26,165.99ZM95.83,165.25C95.83,171 91.17,175.67 85.42,175.67C79.66,175.67 75,171 75,165.25C75,159.5 79.66,154.83 85.42,154.83C91.17,154.83 95.83,159.5 95.83,165.25ZM91.67,165.25C91.67,168.7 88.87,171.5 85.42,171.5C81.97,171.5 79.17,168.7 79.17,165.25C79.17,161.8 81.97,159 85.42,159C88.87,159 91.67,161.8 91.67,165.25Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M40.32,71.91C44.63,70.3 49.29,69.42 54.17,69.42C59.05,69.42 63.71,70.3 68.02,71.91C69.1,72.31 70.3,71.76 70.7,70.69C71.11,69.61 70.56,68.41 69.48,68.01C64.71,66.22 59.55,65.25 54.17,65.25C48.79,65.25 43.63,66.22 38.86,68.01C37.78,68.41 37.23,69.61 37.64,70.69C38.04,71.76 39.24,72.31 40.32,71.91ZM54.17,77.75C44.63,77.75 36.16,82.33 30.83,89.42C30.14,90.34 28.84,90.52 27.92,89.83C27,89.14 26.81,87.84 27.5,86.92C33.58,78.82 43.26,73.58 54.17,73.58C65,73.58 74.04,78.01 80.64,84.61C81.46,85.42 81.46,86.74 80.65,87.56C79.83,88.37 78.51,88.37 77.7,87.56C71.8,81.66 63.79,77.75 54.17,77.75ZM53.88,81.92C40.43,81.92 29.8,93.31 30.73,106.72L30.92,109.42C31.16,112.92 31.98,116.35 33.36,119.57L34.54,122.32C34.99,123.38 36.22,123.87 37.28,123.42C38.33,122.96 38.82,121.74 38.37,120.68L37.2,117.93C36,115.14 35.28,112.17 35.07,109.13L34.89,106.43C34.13,95.43 42.85,86.08 53.88,86.08C64.39,86.08 72.92,94.61 72.92,105.12V106.92C72.92,108.07 71.98,109 70.83,109C69.68,109 68.75,108.07 68.75,106.92V104.83C68.75,101.48 67.54,97.84 64.95,95.02C62.31,92.15 58.35,90.25 53.13,90.25C47.69,90.25 44.19,92.72 42.13,95.89C40.16,98.92 39.58,102.48 39.58,104.83C39.58,110.65 40.11,114.89 41.57,118.39C43.05,121.96 45.42,124.56 48.67,127.27C49.55,128 50.86,127.88 51.6,127C52.34,126.12 52.22,124.8 51.33,124.07C48.33,121.57 46.53,119.48 45.41,116.79C44.27,114.05 43.75,110.47 43.75,104.83C43.75,103.02 44.22,100.32 45.63,98.16C46.96,96.11 49.18,94.42 53.13,94.42C57.27,94.42 60.09,95.89 61.88,97.84C63.71,99.83 64.58,102.43 64.58,104.83V106.92C64.58,110.37 67.38,113.17 70.83,113.17C74.29,113.17 77.08,110.37 77.08,106.92V105.12C77.08,92.31 66.69,81.92 53.88,81.92ZM51.99,104.71C51.99,103.66 52.86,102.75 54.05,102.75C55.27,102.75 56.25,103.74 56.25,104.95V108.36C56.25,112.04 57.98,115.51 60.93,117.72L62.64,119C64.8,120.62 67.43,121.5 70.14,121.5H70.83C71.98,121.5 72.92,120.57 72.92,119.42C72.92,118.27 71.98,117.33 70.83,117.33H70.14C68.34,117.33 66.58,116.75 65.14,115.67L63.43,114.39C61.53,112.96 60.42,110.73 60.42,108.36V104.95C60.42,101.43 57.57,98.58 54.05,98.58C50.7,98.58 47.82,101.22 47.83,104.71C47.83,106.76 47.91,109.34 48.19,111.72C48.51,114.31 49.76,116.35 51.1,118.04C51.71,118.81 52.38,119.56 53,120.26L53.16,120.44C53.84,121.21 54.48,121.93 55.04,122.68C56.42,124.5 56.79,125.99 56.4,126.98C55.97,128.04 56.49,129.26 57.56,129.68C58.63,130.11 59.84,129.59 60.27,128.52C61.53,125.38 59.93,122.22 58.36,120.16C57.69,119.27 56.96,118.44 56.28,117.68L56.12,117.51C55.49,116.79 54.9,116.13 54.37,115.46C53.23,114.02 52.51,112.71 52.33,111.23C52.07,109.07 52,106.68 51.99,104.71Z" />
 </vector>
diff --git a/app/src/main/res/drawable/blocked_uri.xml b/app/src/main/res/drawable/blocked_uri.xml
index 53e78dc836..c189077a6e 100644
--- a/app/src/main/res/drawable/blocked_uri.xml
+++ b/app/src/main/res/drawable/blocked_uri.xml
@@ -3,36 +3,45 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M200,100.67C200,155.9 155.23,200.67 100,200.67C44.77,200.67 0,155.9 0,100.67C0,45.44 44.77,0.67 100,0.67C155.23,0.67 200,45.44 200,100.67Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M100,196.5C152.93,196.5 195.83,153.59 195.83,100.67C195.83,47.74 152.93,4.83 100,4.83C47.07,4.83 4.17,47.74 4.17,100.67C4.17,153.59 47.07,196.5 100,196.5ZM100,200.67C155.23,200.67 200,155.9 200,100.67C200,45.44 155.23,0.67 100,0.67C44.77,0.67 0,45.44 0,100.67C0,155.9 44.77,200.67 100,200.67Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M84.28,1.89C105.41,17.95 120.99,40.92 127.66,67.43C155.17,68.51 180.27,78.94 199.88,95.64C199.96,97.31 200,98.98 200,100.67C200,100.88 200,101.09 200,101.3C180.96,83.98 156.07,72.99 128.64,71.64C130.35,79.66 131.25,87.97 131.25,96.5C131.25,123.36 122.33,148.13 107.3,168.02C116.3,170.29 125.71,171.5 135.42,171.5C150.43,171.5 164.77,168.61 177.91,163.36C176.1,165.61 174.19,167.78 172.19,169.86C160.61,173.63 148.25,175.67 135.42,175.67C124.72,175.67 114.35,174.25 104.49,171.6C96.17,181.78 86.19,190.55 74.97,197.51C73.12,197.03 71.3,196.51 69.49,195.93C81.15,189.23 91.51,180.55 100.13,170.34C71.25,161.36 47.1,141.67 32.33,115.91C24.2,126.39 17.84,138.32 13.72,151.26C12.77,149.63 11.86,147.98 10.99,146.3C15.46,133.74 21.98,122.15 30.15,111.94C21.54,95.49 16.67,76.77 16.67,56.92C16.67,52.69 16.89,48.51 17.32,44.4C18.94,42.03 20.66,39.72 22.47,37.5C21.39,43.81 20.83,50.3 20.83,56.92C20.83,75.45 25.23,92.96 33.05,108.46C54.82,83.27 87.01,67.33 122.92,67.33C123.06,67.33 123.2,67.33 123.34,67.33C116.41,40.95 100.32,18.29 78.67,2.95C80.52,2.54 82.39,2.19 84.28,1.89ZM127.08,96.5C127.08,87.92 126.14,79.55 124.35,71.51C123.87,71.5 123.39,71.5 122.92,71.5C87.68,71.5 56.17,87.4 35.15,112.42C49.59,138.45 73.86,158.26 102.96,166.84C118.08,147.42 127.08,123.01 127.08,96.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M139.58,67.33C139.58,74.24 133.99,79.83 127.08,79.83C120.18,79.83 114.58,74.24 114.58,67.33C114.58,60.43 120.18,54.83 127.08,54.83C133.99,54.83 139.58,60.43 139.58,67.33Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M127.08,75.67C131.69,75.67 135.42,71.94 135.42,67.33C135.42,62.73 131.69,59 127.08,59C122.48,59 118.75,62.73 118.75,67.33C118.75,71.94 122.48,75.67 127.08,75.67ZM127.08,79.83C133.99,79.83 139.58,74.24 139.58,67.33C139.58,60.43 133.99,54.83 127.08,54.83C120.18,54.83 114.58,60.43 114.58,67.33C114.58,74.24 120.18,79.83 127.08,79.83Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M116.67,167.33C116.67,174.24 111.07,179.83 104.17,179.83C97.26,179.83 91.67,174.24 91.67,167.33C91.67,160.43 97.26,154.83 104.17,154.83C111.07,154.83 116.67,160.43 116.67,167.33Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M104.17,175.67C108.77,175.67 112.5,171.94 112.5,167.33C112.5,162.73 108.77,159 104.17,159C99.56,159 95.83,162.73 95.83,167.33C95.83,171.94 99.56,175.67 104.17,175.67ZM104.17,179.83C111.07,179.83 116.67,174.24 116.67,167.33C116.67,160.43 111.07,154.83 104.17,154.83C97.26,154.83 91.67,160.43 91.67,167.33C91.67,174.24 97.26,179.83 104.17,179.83Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M45.83,109C45.83,115.9 40.24,121.5 33.33,121.5C26.43,121.5 20.83,115.9 20.83,109C20.83,102.1 26.43,96.5 33.33,96.5C40.24,96.5 45.83,102.1 45.83,109Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M33.33,117.33C37.94,117.33 41.67,113.6 41.67,109C41.67,104.4 37.94,100.67 33.33,100.67C28.73,100.67 25,104.4 25,109C25,113.6 28.73,117.33 33.33,117.33ZM33.33,121.5C40.24,121.5 45.83,115.9 45.83,109C45.83,102.1 40.24,96.5 33.33,96.5C26.43,96.5 20.83,102.1 20.83,109C20.83,115.9 26.43,121.5 33.33,121.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M200,100.67C200,155.9 155.23,200.67 100,200.67C44.77,200.67 0,155.9 0,100.67C0,45.44 44.77,0.67 100,0.67C155.23,0.67 200,45.44 200,100.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M100,196.5C152.93,196.5 195.83,153.59 195.83,100.67C195.83,47.74 152.93,4.83 100,4.83C47.07,4.83 4.17,47.74 4.17,100.67C4.17,153.59 47.07,196.5 100,196.5ZM100,200.67C155.23,200.67 200,155.9 200,100.67C200,45.44 155.23,0.67 100,0.67C44.77,0.67 0,45.44 0,100.67C0,155.9 44.77,200.67 100,200.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M84.28,1.89C105.41,17.95 120.99,40.92 127.66,67.43C155.17,68.51 180.27,78.94 199.88,95.64C199.96,97.31 200,98.98 200,100.67C200,100.88 200,101.09 200,101.3C180.96,83.98 156.07,72.99 128.64,71.64C130.35,79.66 131.25,87.97 131.25,96.5C131.25,123.36 122.33,148.13 107.3,168.02C116.3,170.29 125.71,171.5 135.42,171.5C150.43,171.5 164.77,168.61 177.91,163.36C176.1,165.61 174.19,167.78 172.19,169.86C160.61,173.63 148.25,175.67 135.42,175.67C124.72,175.67 114.35,174.25 104.49,171.6C96.17,181.78 86.19,190.55 74.97,197.51C73.12,197.03 71.3,196.51 69.49,195.93C81.15,189.23 91.51,180.55 100.13,170.34C71.25,161.36 47.1,141.67 32.33,115.91C24.2,126.39 17.84,138.32 13.72,151.26C12.77,149.63 11.86,147.98 10.99,146.3C15.46,133.74 21.98,122.15 30.15,111.94C21.54,95.49 16.67,76.77 16.67,56.92C16.67,52.69 16.89,48.51 17.32,44.4C18.94,42.03 20.66,39.72 22.47,37.5C21.39,43.81 20.83,50.3 20.83,56.92C20.83,75.45 25.23,92.96 33.05,108.46C54.82,83.27 87.01,67.33 122.92,67.33C123.06,67.33 123.2,67.33 123.34,67.33C116.41,40.95 100.32,18.29 78.67,2.95C80.52,2.54 82.39,2.19 84.28,1.89ZM127.08,96.5C127.08,87.92 126.14,79.55 124.35,71.51C123.87,71.5 123.39,71.5 122.92,71.5C87.68,71.5 56.17,87.4 35.15,112.42C49.59,138.45 73.86,158.26 102.96,166.84C118.08,147.42 127.08,123.01 127.08,96.5Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M139.58,67.33C139.58,74.24 133.99,79.83 127.08,79.83C120.18,79.83 114.58,74.24 114.58,67.33C114.58,60.43 120.18,54.83 127.08,54.83C133.99,54.83 139.58,60.43 139.58,67.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M127.08,75.67C131.69,75.67 135.42,71.94 135.42,67.33C135.42,62.73 131.69,59 127.08,59C122.48,59 118.75,62.73 118.75,67.33C118.75,71.94 122.48,75.67 127.08,75.67ZM127.08,79.83C133.99,79.83 139.58,74.24 139.58,67.33C139.58,60.43 133.99,54.83 127.08,54.83C120.18,54.83 114.58,60.43 114.58,67.33C114.58,74.24 120.18,79.83 127.08,79.83Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M116.67,167.33C116.67,174.24 111.07,179.83 104.17,179.83C97.26,179.83 91.67,174.24 91.67,167.33C91.67,160.43 97.26,154.83 104.17,154.83C111.07,154.83 116.67,160.43 116.67,167.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M104.17,175.67C108.77,175.67 112.5,171.94 112.5,167.33C112.5,162.73 108.77,159 104.17,159C99.56,159 95.83,162.73 95.83,167.33C95.83,171.94 99.56,175.67 104.17,175.67ZM104.17,179.83C111.07,179.83 116.67,174.24 116.67,167.33C116.67,160.43 111.07,154.83 104.17,154.83C97.26,154.83 91.67,160.43 91.67,167.33C91.67,174.24 97.26,179.83 104.17,179.83Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M45.83,109C45.83,115.9 40.24,121.5 33.33,121.5C26.43,121.5 20.83,115.9 20.83,109C20.83,102.1 26.43,96.5 33.33,96.5C40.24,96.5 45.83,102.1 45.83,109Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M33.33,117.33C37.94,117.33 41.67,113.6 41.67,109C41.67,104.4 37.94,100.67 33.33,100.67C28.73,100.67 25,104.4 25,109C25,113.6 28.73,117.33 33.33,117.33ZM33.33,121.5C40.24,121.5 45.83,115.9 45.83,109C45.83,102.1 40.24,96.5 33.33,96.5C26.43,96.5 20.83,102.1 20.83,109C20.83,115.9 26.43,121.5 33.33,121.5Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_generator_filled.xml b/app/src/main/res/drawable/ic_generator_filled.xml
index d1c791d6d3..963d55bdf7 100644
--- a/app/src/main/res/drawable/ic_generator_filled.xml
+++ b/app/src/main/res/drawable/ic_generator_filled.xml
@@ -6,25 +6,31 @@
     <group>
         <clip-path android:pathData="M0,0h24v24h-24z" />
         <path
+            android:name="navigationActiveAccent"
             android:fillColor="#DBE5F6"
             android:pathData="M19,12C19,15.866 15.866,19 12,19C8.134,19 5,15.866 5,12C5,8.134 8.134,5 12,5C15.866,5 19,8.134 19,12Z" />
         <path
+            android:name="navigation"
             android:fillColor="#175DDC"
             android:fillType="evenOdd"
             android:pathData="M22.796,12.49C23.345,12.549 23.742,13.043 23.683,13.592C23.061,19.319 18.128,23.752 12.167,23.752C7.395,23.752 3.288,20.914 1.516,16.849C1.296,16.343 1.527,15.753 2.033,15.533C2.54,15.312 3.129,15.544 3.35,16.05C4.808,19.396 8.202,21.752 12.167,21.752C17.127,21.752 21.185,18.068 21.694,13.376C21.754,12.827 22.247,12.43 22.796,12.49Z" />
         <path
+            android:name="navigation"
             android:fillColor="#175DDC"
             android:fillType="evenOdd"
             android:pathData="M7.439,16.08C7.439,15.528 6.991,15.08 6.439,15.08H1.25C0.698,15.08 0.25,15.528 0.25,16.08V21.27C0.25,21.823 0.698,22.27 1.25,22.27C1.802,22.27 2.25,21.823 2.25,21.27V17.08H6.439C6.991,17.08 7.439,16.633 7.439,16.08Z" />
         <path
+            android:name="navigation"
             android:fillColor="#175DDC"
             android:fillType="evenOdd"
             android:pathData="M1.206,11.512C0.657,11.452 0.261,10.959 0.32,10.41C0.942,4.683 5.874,0.25 11.836,0.25C16.608,0.25 20.714,3.087 22.486,7.152C22.707,7.659 22.476,8.248 21.969,8.469C21.463,8.689 20.874,8.458 20.653,7.952C19.194,4.606 15.801,2.25 11.836,2.25C6.876,2.25 2.818,5.933 2.309,10.626C2.249,11.175 1.755,11.572 1.206,11.512Z" />
         <path
+            android:name="navigation"
             android:fillColor="#175DDC"
             android:fillType="evenOdd"
             android:pathData="M16.564,7.921C16.564,8.473 17.012,8.921 17.564,8.921H22.753C23.305,8.921 23.753,8.473 23.753,7.921V2.731C23.753,2.179 23.305,1.731 22.753,1.731C22.2,1.731 21.753,2.179 21.753,2.731V6.921H17.564C17.012,6.921 16.564,7.369 16.564,7.921Z" />
         <path
+            android:name="navigation"
             android:fillColor="#175DDC"
             android:fillType="evenOdd"
             android:pathData="M12.007,8C12.559,8 13.007,8.447 13.007,9V10.7L14.602,10.177C15.127,10.005 15.691,10.291 15.863,10.816C16.035,11.341 15.749,11.906 15.224,12.078L13.611,12.606L14.62,14.018C14.941,14.467 14.836,15.092 14.387,15.413C13.937,15.734 13.313,15.63 12.992,15.18L12.007,13.8L11.021,15.18C10.7,15.63 10.076,15.734 9.626,15.413C9.177,15.092 9.073,14.468 9.394,14.018L10.402,12.606L8.789,12.078C8.264,11.906 7.978,11.341 8.15,10.816C8.322,10.291 8.886,10.005 9.411,10.177L11.007,10.7V9C11.007,8.447 11.454,8 12.007,8Z" />
diff --git a/app/src/main/res/drawable/ic_send_filled.xml b/app/src/main/res/drawable/ic_send_filled.xml
index 0fd2e5423d..de9d3b1f3f 100644
--- a/app/src/main/res/drawable/ic_send_filled.xml
+++ b/app/src/main/res/drawable/ic_send_filled.xml
@@ -3,11 +3,13 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M9,22V17L22,2.5L20,21.5L13,19L10,22H9Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M23.555,3.377C23.885,1.683 22.06,0.394 20.574,1.272L2.278,12.083C0.835,12.936 1.017,15.077 2.583,15.674L7.999,17.739V21.815C7.999,22.746 8.754,23.5 9.684,23.5C10.176,23.5 10.644,23.285 10.964,22.912L13.379,20.094L17.445,21.903C18.62,22.426 19.975,21.721 20.222,20.459L23.555,3.377ZM11.472,19.245L9.999,18.59V20.964L11.472,19.245ZM18.258,20.076L10.675,16.701L15.737,11.176C16.11,10.768 16.082,10.136 15.675,9.763C15.268,9.39 14.635,9.417 14.262,9.825L8.721,15.874L3.295,13.805L21.592,2.994L18.258,20.076Z"
-      android:fillColor="#175DDC"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="navigationActiveAccent"
+        android:fillColor="#DBE5F6"
+        android:pathData="M9,22V17L22,2.5L20,21.5L13,19L10,22H9Z" />
+    <path
+        android:name="navigation"
+        android:fillColor="#175DDC"
+        android:fillType="evenOdd"
+        android:pathData="M23.555,3.377C23.885,1.683 22.06,0.394 20.574,1.272L2.278,12.083C0.835,12.936 1.017,15.077 2.583,15.674L7.999,17.739V21.815C7.999,22.746 8.754,23.5 9.684,23.5C10.176,23.5 10.644,23.285 10.964,22.912L13.379,20.094L17.445,21.903C18.62,22.426 19.975,21.721 20.222,20.459L23.555,3.377ZM11.472,19.245L9.999,18.59V20.964L11.472,19.245ZM18.258,20.076L10.675,16.701L15.737,11.176C16.11,10.768 16.082,10.136 15.675,9.763C15.268,9.39 14.635,9.417 14.262,9.825L8.721,15.874L3.295,13.805L21.592,2.994L18.258,20.076Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_filled.xml b/app/src/main/res/drawable/ic_settings_filled.xml
index fa301ec82f..dfdffbcbfa 100644
--- a/app/src/main/res/drawable/ic_settings_filled.xml
+++ b/app/src/main/res/drawable/ic_settings_filled.xml
@@ -3,19 +3,21 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <group>
-    <clip-path
-        android:pathData="M0,0h24v24h-24z"/>
-    <path
-        android:pathData="M20.36,3.639C20.74,3.605 21.117,3.791 21.315,4.135L23.468,7.864C23.712,8.288 23.615,8.826 23.237,9.136L21.851,10.277C21.949,10.837 21.999,11.413 21.999,12C21.999,12.587 21.949,13.163 21.851,13.722L23.237,14.863C23.615,15.174 23.712,15.712 23.468,16.135L21.315,19.864C21.071,20.288 20.556,20.472 20.098,20.301L18.416,19.67C17.537,20.406 16.53,20.994 15.434,21.395L15.139,23.164C15.058,23.646 14.641,24 14.152,24H9.846C9.358,24 8.94,23.646 8.86,23.164L8.565,21.395C7.468,20.993 6.462,20.406 5.583,19.67L3.9,20.301C3.814,20.333 3.726,20.353 3.639,20.36L9.878,14.121C10.421,14.664 11.171,15 11.999,15C13.656,15 14.999,13.657 14.999,12C14.999,11.171 14.663,10.421 14.121,9.879L20.36,3.639Z"
-        android:fillColor="#DBE5F6"/>
-    <path
-        android:pathData="M16.999,12C16.999,14.761 14.761,17 11.999,17C9.238,17 6.999,14.761 6.999,12C6.999,9.239 9.238,7 11.999,7C14.761,7 16.999,9.239 16.999,12ZM14.999,12C14.999,13.657 13.656,15 11.999,15C10.342,15 8.999,13.657 8.999,12C8.999,10.343 10.342,9 11.999,9C13.656,9 14.999,10.343 14.999,12Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M15.434,2.605L15.139,0.836C15.058,0.353 14.641,0 14.152,0H9.846C9.358,0 8.94,0.353 8.86,0.836L8.565,2.605C7.468,3.006 6.462,3.594 5.583,4.33L3.9,3.699C3.442,3.528 2.928,3.712 2.683,4.136L0.531,7.864C0.286,8.288 0.384,8.826 0.761,9.136L2.147,10.278C2.05,10.837 1.999,11.413 1.999,12C1.999,12.587 2.05,13.163 2.147,13.722L0.761,14.863C0.384,15.174 0.286,15.712 0.531,16.135L2.683,19.864C2.928,20.288 3.442,20.472 3.9,20.301L5.583,19.67C6.462,20.406 7.468,20.994 8.565,21.395L8.86,23.164C8.94,23.647 9.358,24 9.846,24H14.152C14.641,24 15.058,23.647 15.139,23.164L15.434,21.395C16.53,20.994 17.537,20.406 18.416,19.67L20.098,20.301C20.556,20.472 21.071,20.288 21.315,19.864L23.468,16.135C23.712,15.712 23.615,15.174 23.237,14.863L21.851,13.722C21.949,13.163 21.999,12.587 21.999,12C21.999,11.413 21.949,10.837 21.851,10.278L23.237,9.136C23.615,8.826 23.712,8.288 23.468,7.864L21.315,4.136C21.071,3.712 20.556,3.528 20.098,3.699L18.416,4.33C17.537,3.594 16.53,3.006 15.434,2.605ZM13.652,4.083L13.305,2H10.693L10.346,4.083L9.252,4.484C8.376,4.804 7.571,5.273 6.867,5.863L5.973,6.611L3.992,5.869L2.686,8.131L4.317,9.473L4.118,10.62C4.04,11.067 3.999,11.528 3.999,12C3.999,12.472 4.04,12.933 4.118,13.38L4.317,14.527L2.686,15.869L3.992,18.131L5.973,17.389L6.867,18.137C7.571,18.726 8.376,19.196 9.252,19.516L10.346,19.917L10.693,22H13.305L13.652,19.917L14.747,19.516C15.622,19.196 16.428,18.726 17.132,18.137L18.025,17.389L20.007,18.131L21.312,15.869L19.682,14.527L19.881,13.38C19.959,12.933 19.999,12.472 19.999,12C19.999,11.528 19.959,11.067 19.881,10.62L19.682,9.473L21.312,8.131L20.007,5.869L18.025,6.611L17.132,5.863C16.428,5.273 15.622,4.804 14.747,4.484L13.652,4.083Z"
-        android:fillColor="#175DDC"
-        android:fillType="evenOdd"/>
-  </group>
+    <group>
+        <clip-path android:pathData="M0,0h24v24h-24z" />
+        <path
+            android:name="navigationActiveAccent"
+            android:fillColor="#DBE5F6"
+            android:pathData="M20.36,3.639C20.74,3.605 21.117,3.791 21.315,4.135L23.468,7.864C23.712,8.288 23.615,8.826 23.237,9.136L21.851,10.277C21.949,10.837 21.999,11.413 21.999,12C21.999,12.587 21.949,13.163 21.851,13.722L23.237,14.863C23.615,15.174 23.712,15.712 23.468,16.135L21.315,19.864C21.071,20.288 20.556,20.472 20.098,20.301L18.416,19.67C17.537,20.406 16.53,20.994 15.434,21.395L15.139,23.164C15.058,23.646 14.641,24 14.152,24H9.846C9.358,24 8.94,23.646 8.86,23.164L8.565,21.395C7.468,20.993 6.462,20.406 5.583,19.67L3.9,20.301C3.814,20.333 3.726,20.353 3.639,20.36L9.878,14.121C10.421,14.664 11.171,15 11.999,15C13.656,15 14.999,13.657 14.999,12C14.999,11.171 14.663,10.421 14.121,9.879L20.36,3.639Z" />
+        <path
+            android:name="navigation"
+            android:fillColor="#175DDC"
+            android:fillType="evenOdd"
+            android:pathData="M16.999,12C16.999,14.761 14.761,17 11.999,17C9.238,17 6.999,14.761 6.999,12C6.999,9.239 9.238,7 11.999,7C14.761,7 16.999,9.239 16.999,12ZM14.999,12C14.999,13.657 13.656,15 11.999,15C10.342,15 8.999,13.657 8.999,12C8.999,10.343 10.342,9 11.999,9C13.656,9 14.999,10.343 14.999,12Z" />
+        <path
+            android:name="navigation"
+            android:fillColor="#175DDC"
+            android:fillType="evenOdd"
+            android:pathData="M15.434,2.605L15.139,0.836C15.058,0.353 14.641,0 14.152,0H9.846C9.358,0 8.94,0.353 8.86,0.836L8.565,2.605C7.468,3.006 6.462,3.594 5.583,4.33L3.9,3.699C3.442,3.528 2.928,3.712 2.683,4.136L0.531,7.864C0.286,8.288 0.384,8.826 0.761,9.136L2.147,10.278C2.05,10.837 1.999,11.413 1.999,12C1.999,12.587 2.05,13.163 2.147,13.722L0.761,14.863C0.384,15.174 0.286,15.712 0.531,16.135L2.683,19.864C2.928,20.288 3.442,20.472 3.9,20.301L5.583,19.67C6.462,20.406 7.468,20.994 8.565,21.395L8.86,23.164C8.94,23.647 9.358,24 9.846,24H14.152C14.641,24 15.058,23.647 15.139,23.164L15.434,21.395C16.53,20.994 17.537,20.406 18.416,19.67L20.098,20.301C20.556,20.472 21.071,20.288 21.315,19.864L23.468,16.135C23.712,15.712 23.615,15.174 23.237,14.863L21.851,13.722C21.949,13.163 21.999,12.587 21.999,12C21.999,11.413 21.949,10.837 21.851,10.278L23.237,9.136C23.615,8.826 23.712,8.288 23.468,7.864L21.315,4.136C21.071,3.712 20.556,3.528 20.098,3.699L18.416,4.33C17.537,3.594 16.53,3.006 15.434,2.605ZM13.652,4.083L13.305,2H10.693L10.346,4.083L9.252,4.484C8.376,4.804 7.571,5.273 6.867,5.863L5.973,6.611L3.992,5.869L2.686,8.131L4.317,9.473L4.118,10.62C4.04,11.067 3.999,11.528 3.999,12C3.999,12.472 4.04,12.933 4.118,13.38L4.317,14.527L2.686,15.869L3.992,18.131L5.973,17.389L6.867,18.137C7.571,18.726 8.376,19.196 9.252,19.516L10.346,19.917L10.693,22H13.305L13.652,19.917L14.747,19.516C15.622,19.196 16.428,18.726 17.132,18.137L18.025,17.389L20.007,18.131L21.312,15.869L19.682,14.527L19.881,13.38C19.959,12.933 19.999,12.472 19.999,12C19.999,11.528 19.959,11.067 19.881,10.62L19.682,9.473L21.312,8.131L20.007,5.869L18.025,6.611L17.132,5.863C16.428,5.273 15.622,4.804 14.747,4.484L13.652,4.083Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_vault_filled.xml b/app/src/main/res/drawable/ic_vault_filled.xml
index cf997808df..539de4bde3 100644
--- a/app/src/main/res/drawable/ic_vault_filled.xml
+++ b/app/src/main/res/drawable/ic_vault_filled.xml
@@ -4,13 +4,16 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
+        android:name="navigationActiveAccent"
         android:fillColor="#DBE5F6"
         android:pathData="M2,19H22V5L10.823,12.824C10.529,13.474 9.897,13.939 9.151,13.994L2,19Z" />
     <path
+        android:name="navigation"
         android:fillColor="#175DDC"
         android:fillType="evenOdd"
         android:pathData="M9,6C9.552,6 10,6.448 10,7V8.126C10.715,8.31 11.352,8.687 11.854,9.197L12.83,8.634C13.308,8.358 13.92,8.522 14.196,9C14.472,9.478 14.308,10.09 13.83,10.366L12.855,10.929C12.95,11.27 13,11.629 13,12C13,12.371 12.95,12.73 12.855,13.071L13.83,13.634C14.308,13.91 14.472,14.522 14.196,15C13.92,15.478 13.308,15.642 12.83,15.366L11.854,14.802C11.352,15.313 10.715,15.69 10,15.874V17C10,17.552 9.552,18 9,18C8.448,18 8,17.552 8,17V15.874C7.285,15.69 6.647,15.313 6.146,14.802L5.17,15.366C4.692,15.642 4.08,15.478 3.804,15C3.528,14.522 3.692,13.91 4.17,13.634L5.145,13.071C5.05,12.73 5,12.371 5,12C5,11.629 5.05,11.27 5.145,10.929L4.17,10.366C3.692,10.09 3.528,9.478 3.804,9C4.08,8.522 4.692,8.358 5.17,8.634L6.146,9.197C6.647,8.687 7.285,8.31 8,8.126V7C8,6.448 8.448,6 9,6ZM11,12C11,12.357 10.907,12.692 10.743,12.982L10.732,13L10.722,13.017C10.374,13.606 9.733,14 9,14C8.267,14 7.627,13.606 7.278,13.018L7.268,13L7.257,12.981C7.093,12.691 7,12.356 7,12C7,11.644 7.093,11.309 7.257,11.019L7.268,11L7.278,10.982C7.627,10.394 8.267,10 9,10C9.733,10 10.374,10.394 10.722,10.982L10.732,11L10.743,11.019C10.907,11.309 11,11.643 11,12Z" />
     <path
+        android:name="navigation"
         android:fillColor="#175DDC"
         android:fillType="evenOdd"
         android:pathData="M3,22V21C1.343,21 0,19.657 0,18V6C0,4.343 1.343,3 3,3H21C22.657,3 24,4.343 24,6V18C24,19.657 22.657,21 21,21V22C21,22.552 20.552,23 20,23C19.448,23 19,22.552 19,22V21H5V22C5,22.552 4.552,23 4,23C3.448,23 3,22.552 3,22ZM21,5H3C2.448,5 2,5.448 2,6V18C2,18.552 2.448,19 3,19H21C21.552,19 22,18.552 22,18V16H20C19.448,16 19,15.552 19,15C19,14.448 19.448,14 20,14H22V10H20C19.448,10 19,9.552 19,9C19,8.448 19.448,8 20,8H22V6C22,5.448 21.552,5 21,5Z" />
diff --git a/app/src/main/res/drawable/il_secure_devices.xml b/app/src/main/res/drawable/il_secure_devices.xml
index b5af5b1b9d..e44ce1816d 100644
--- a/app/src/main/res/drawable/il_secure_devices.xml
+++ b/app/src/main/res/drawable/il_secure_devices.xml
@@ -4,70 +4,89 @@
     android:viewportWidth="96"
     android:viewportHeight="96">
     <path
+        android:name="primary"
         android:fillColor="#DBE5F6"
         android:pathData="M9,18C9,14.686 11.686,12 15,12H81C84.314,12 87,14.686 87,18V60C87,63.314 84.314,66 81,66H15C11.686,66 9,63.314 9,60V18Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M81,14H15C12.791,14 11,15.791 11,18V60C11,62.209 12.791,64 15,64H81C83.209,64 85,62.209 85,60V18C85,15.791 83.209,14 81,14ZM15,12C11.686,12 9,14.686 9,18V60C9,63.314 11.686,66 15,66H81C84.314,66 87,63.314 87,60V18C87,14.686 84.314,12 81,12H15Z" />
     <path
+        android:name="secondary"
         android:fillColor="#AAC3EF"
         android:pathData="M9,18H87V60H9V18Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M85,20H11V58H85V20ZM9,18V60H87V18H9Z" />
     <path
+        android:name="primary"
         android:fillColor="#DBE5F6"
         android:pathData="M39,65H57V83H39V65Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M38,64H58V82H66C66.552,82 67,82.448 67,83C67,83.552 66.552,84 66,84H30C29.448,84 29,83.552 29,83C29,82.448 29.448,82 30,82H38V64ZM40,82H56V66H40V82Z" />
     <path
+        android:name="tertiary"
         android:fillColor="#ffffff"
         android:pathData="M0,48C0,45.791 1.791,44 4,44H22C24.209,44 26,45.791 26,48V80C26,82.209 24.209,84 22,84H4C1.791,84 0,82.209 0,80V48Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M22,46H4C2.895,46 2,46.895 2,48V80C2,81.105 2.895,82 4,82H22C23.105,82 24,81.105 24,80V48C24,46.895 23.105,46 22,46ZM4,44C1.791,44 0,45.791 0,48V80C0,82.209 1.791,84 4,84H22C24.209,84 26,82.209 26,80V48C26,45.791 24.209,44 22,44H4Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M10,49C10,48.448 10.448,48 11,48L15,48C15.552,48 16,48.448 16,49C16,49.552 15.552,50 15,50L11,50C10.448,50 10,49.552 10,49Z" />
     <path
+        android:name="primary"
         android:fillColor="#DBE5F6"
         android:fillType="evenOdd"
         android:pathData="M48,55C56.837,55 64,47.837 64,39C64,30.163 56.837,23 48,23C39.163,23 32,30.163 32,39C32,47.837 39.163,55 48,55ZM41,33C39.343,33 38,34.343 38,36V46C38,47.657 39.343,49 41,49H55C56.657,49 58,47.657 58,46V36C58,34.343 56.657,33 55,33H41Z" />
     <path
+        android:name="accent"
         android:fillColor="#FFBF00"
         android:pathData="M38,36C38,34.343 39.343,33 41,33H55C56.657,33 58,34.343 58,36V46C58,47.657 56.657,49 55,49H41C39.343,49 38,47.657 38,46V36Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M55,35H41C40.448,35 40,35.448 40,36V46C40,46.552 40.448,47 41,47H55C55.552,47 56,46.552 56,46V36C56,35.448 55.552,35 55,35ZM41,33C39.343,33 38,34.343 38,36V46C38,47.657 39.343,49 41,49H55C56.657,49 58,47.657 58,46V36C58,34.343 56.657,33 55,33H41Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:pathData="M47,39C47,38.448 47.448,38 48,38C48.552,38 49,38.448 49,39V43C49,43.552 48.552,44 48,44C47.448,44 47,43.552 47,43V39Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M43,32C43,29.239 45.239,27 48,27C50.761,27 53,29.239 53,32V33H51V32C51,30.343 49.657,29 48,29C46.343,29 45,30.343 45,32V33H43V32Z" />
     <path
+        android:name="tertiary"
         android:fillColor="#ffffff"
         android:pathData="M60,40C60,37.791 61.791,36 64,36H92C94.209,36 96,37.791 96,40V80C96,82.209 94.209,84 92,84H64C61.791,84 60,82.209 60,80V40Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M92,38H64C62.895,38 62,38.895 62,40V80C62,81.105 62.895,82 64,82H92C93.105,82 94,81.105 94,80V40C94,38.895 93.105,38 92,38ZM64,36C61.791,36 60,37.791 60,40V80C60,82.209 61.791,84 64,84H92C94.209,84 96,82.209 96,80V40C96,37.791 94.209,36 92,36H64Z" />
     <path
+        android:name="secondary"
         android:fillColor="#AAC3EF"
         android:pathData="M81,76C81,77.657 79.657,79 78,79C76.343,79 75,77.657 75,76C75,74.343 76.343,73 78,73C79.657,73 81,74.343 81,76Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M78,77C78.552,77 79,76.552 79,76C79,75.448 78.552,75 78,75C77.448,75 77,75.448 77,76C77,76.552 77.448,77 78,77ZM78,79C79.657,79 81,77.657 81,76C81,74.343 79.657,73 78,73C76.343,73 75,74.343 75,76C75,77.657 76.343,79 78,79Z" />
     <path
+        android:name="secondary"
         android:fillColor="#AAC3EF"
         android:pathData="M40,66H56V72H40V66Z" />
 </vector>
diff --git a/app/src/main/res/drawable/img_2fa.xml b/app/src/main/res/drawable/img_2fa.xml
index 735a3c4a71..3a2ba899f7 100644
--- a/app/src/main/res/drawable/img_2fa.xml
+++ b/app/src/main/res/drawable/img_2fa.xml
@@ -4,69 +4,88 @@
     android:viewportWidth="200"
     android:viewportHeight="201">
     <path
+        android:name="primary"
         android:fillColor="#DBE5F6"
         android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H125C131.9,25.67 137.5,31.26 137.5,38.17V117.33C137.5,124.24 131.9,129.83 125,129.83H12.5C5.6,129.83 0,124.24 0,117.33V38.17Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M125,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V117.33C4.17,121.94 7.9,125.67 12.5,125.67H125C129.6,125.67 133.33,121.94 133.33,117.33V38.17C133.33,33.56 129.6,29.83 125,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V117.33C0,124.24 5.6,129.83 12.5,129.83H125C131.9,129.83 137.5,124.24 137.5,117.33V38.17C137.5,31.26 131.9,25.67 125,25.67H12.5Z" />
     <path
+        android:name="secondary"
         android:fillColor="#AAC3EF"
         android:pathData="M47.92,75.67C47.92,72.21 50.71,69.42 54.17,69.42H83.33C86.78,69.42 89.58,72.21 89.58,75.67V96.5C89.58,99.95 86.78,102.75 83.33,102.75H54.17C50.71,102.75 47.92,99.95 47.92,96.5V75.67Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M83.33,73.58H54.17C53.02,73.58 52.08,74.52 52.08,75.67V96.5C52.08,97.65 53.02,98.58 54.17,98.58H83.33C84.48,98.58 85.42,97.65 85.42,96.5V75.67C85.42,74.52 84.48,73.58 83.33,73.58ZM54.17,69.42C50.71,69.42 47.92,72.21 47.92,75.67V96.5C47.92,99.95 50.71,102.75 54.17,102.75H83.33C86.78,102.75 89.58,99.95 89.58,96.5V75.67C89.58,72.21 86.78,69.42 83.33,69.42H54.17Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:pathData="M66.67,81.92C66.67,80.77 67.6,79.83 68.75,79.83C69.9,79.83 70.83,80.77 70.83,81.92V90.25C70.83,91.4 69.9,92.33 68.75,92.33C67.6,92.33 66.67,91.4 66.67,90.25V81.92Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M58.33,67.33C58.33,61.58 63,56.92 68.75,56.92C74.5,56.92 79.17,61.58 79.17,67.33V69.42H75V67.33C75,63.88 72.2,61.08 68.75,61.08C65.3,61.08 62.5,63.88 62.5,67.33V69.42H58.33V67.33Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M135.42,50.67H2.08V46.5H135.42V50.67Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:pathData="M129.17,38.17C129.17,40.47 127.3,42.33 125,42.33C122.7,42.33 120.83,40.47 120.83,38.17C120.83,35.87 122.7,34 125,34C127.3,34 129.17,35.87 129.17,38.17Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:pathData="M116.67,38.17C116.67,40.47 114.8,42.33 112.5,42.33C110.2,42.33 108.33,40.47 108.33,38.17C108.33,35.87 110.2,34 112.5,34C114.8,34 116.67,35.87 116.67,38.17Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:pathData="M104.17,38.17C104.17,40.47 102.3,42.33 100,42.33C97.7,42.33 95.83,40.47 95.83,38.17C95.83,35.87 97.7,34 100,34C102.3,34 104.17,35.87 104.17,38.17Z" />
     <path
+        android:name="tertiary"
         android:fillColor="#ffffff"
         android:pathData="M170.83,88.17C170.83,104.28 157.77,117.33 141.67,117.33C125.56,117.33 112.5,104.28 112.5,88.17C112.5,72.06 125.56,59 141.67,59C157.77,59 170.83,72.06 170.83,88.17Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M141.67,113.17C155.47,113.17 166.67,101.97 166.67,88.17C166.67,74.36 155.47,63.17 141.67,63.17C127.86,63.17 116.67,74.36 116.67,88.17C116.67,101.97 127.86,113.17 141.67,113.17ZM141.67,117.33C157.77,117.33 170.83,104.28 170.83,88.17C170.83,72.06 157.77,59 141.67,59C125.56,59 112.5,72.06 112.5,88.17C112.5,104.28 125.56,117.33 141.67,117.33Z" />
     <path
+        android:name="tertiary"
         android:fillColor="#ffffff"
         android:pathData="M195.64,150.62C198.52,157.57 200,165.02 200,172.54C200,174.27 198.6,175.67 196.87,175.67H88.54C86.82,175.67 85.42,174.27 85.42,172.54C85.42,165.02 86.9,157.57 89.78,150.62C92.66,143.67 96.88,137.35 102.2,132.03C107.52,126.71 113.83,122.49 120.78,119.61C127.73,116.73 135.18,115.25 142.71,115.25C150.23,115.25 157.68,116.73 164.63,119.61C171.58,122.49 177.9,126.71 183.22,132.03C188.54,137.35 192.76,143.67 195.64,150.62Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M195.82,171.5C195.69,164.88 194.33,158.34 191.79,152.21C189.12,145.77 185.21,139.91 180.27,134.98C175.34,130.04 169.48,126.13 163.04,123.46C156.59,120.79 149.68,119.42 142.71,119.42C135.73,119.42 128.82,120.79 122.38,123.46C115.93,126.13 110.08,130.04 105.14,134.98C100.21,139.91 96.3,145.77 93.63,152.21C91.09,158.34 89.72,164.88 89.59,171.5H195.82ZM200,172.54C200,165.02 198.52,157.57 195.64,150.62C192.76,143.67 188.54,137.35 183.22,132.03C177.9,126.71 171.58,122.49 164.63,119.61C157.68,116.73 150.23,115.25 142.71,115.25C135.18,115.25 127.73,116.73 120.78,119.61C113.83,122.49 107.52,126.71 102.2,132.03C96.88,137.35 92.66,143.67 89.78,150.62C86.9,157.57 85.42,165.02 85.42,172.54C85.42,174.27 86.82,175.67 88.54,175.67H196.87C198.6,175.67 200,174.27 200,172.54Z" />
     <path
+        android:name="accent"
         android:fillColor="#FFBF00"
         android:pathData="M22.92,127.75C22.92,118.54 30.38,111.08 39.58,111.08H95.83C105.04,111.08 112.5,118.54 112.5,127.75C112.5,136.95 105.04,144.42 95.83,144.42H39.58C30.38,144.42 22.92,136.95 22.92,127.75Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M95.83,115.25H39.58C32.68,115.25 27.08,120.85 27.08,127.75C27.08,134.65 32.68,140.25 39.58,140.25H95.83C102.74,140.25 108.33,134.65 108.33,127.75C108.33,120.85 102.74,115.25 95.83,115.25ZM39.58,111.08C30.38,111.08 22.92,118.54 22.92,127.75C22.92,136.95 30.38,144.42 39.58,144.42H95.83C105.04,144.42 112.5,136.95 112.5,127.75C112.5,118.54 105.04,111.08 95.83,111.08H39.58Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M41.67,120.61C42.83,120.61 43.76,121.54 43.76,122.69V125.61L46.49,124.71C47.58,124.36 48.76,124.95 49.12,126.05C49.48,127.14 48.88,128.32 47.79,128.67L45.02,129.58L46.75,132.01C47.42,132.95 47.2,134.25 46.27,134.92C45.33,135.59 44.03,135.37 43.36,134.43L41.67,132.07L39.99,134.43C39.32,135.37 38.02,135.59 37.08,134.92C36.14,134.25 35.93,132.95 36.6,132.01L38.33,129.58L35.56,128.67C34.47,128.32 33.87,127.14 34.23,126.05C34.59,124.95 35.76,124.36 36.86,124.71L39.59,125.61V122.69C39.59,121.54 40.52,120.61 41.67,120.61ZM60.42,120.61C61.58,120.61 62.51,121.54 62.51,122.69V125.61L65.24,124.71C66.33,124.36 67.51,124.95 67.87,126.05C68.23,127.14 67.63,128.32 66.54,128.67L63.77,129.58L65.5,132.01C66.17,132.95 65.95,134.25 65.02,134.92C64.08,135.59 62.78,135.37 62.11,134.43L60.42,132.07L58.74,134.43C58.07,135.37 56.77,135.59 55.83,134.92C54.89,134.25 54.68,132.95 55.35,132.01L57.08,129.58L54.31,128.67C53.22,128.32 52.62,127.14 52.98,126.05C53.34,124.95 54.51,124.36 55.61,124.71L58.34,125.61V122.69C58.34,121.54 59.27,120.61 60.42,120.61Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M72.92,131.92C72.92,130.77 73.85,129.83 75,129.83L83.33,129.83C84.48,129.83 85.42,130.77 85.42,131.92C85.42,133.07 84.48,134 83.33,134L75,134C73.85,134 72.92,133.07 72.92,131.92Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M89.58,131.92C89.58,130.77 90.52,129.83 91.67,129.83L100,129.83C101.15,129.83 102.08,130.77 102.08,131.92C102.08,133.07 101.15,134 100,134L91.67,134C90.52,134 89.58,133.07 89.58,131.92Z" />
diff --git a/app/src/main/res/drawable/img_authenticator.xml b/app/src/main/res/drawable/img_authenticator.xml
index 18174ceadf..a9dd1cf4a9 100644
--- a/app/src/main/res/drawable/img_authenticator.xml
+++ b/app/src/main/res/drawable/img_authenticator.xml
@@ -3,71 +3,83 @@
     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"/>
+    <path
+        android:name="primary"
+        android:fillColor="#AAC3EF"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M197.92,50.67L35.42,50.67L35.42,46.5L197.92,46.5L197.92,50.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        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" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        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" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        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" />
 </vector>
diff --git a/app/src/main/res/drawable/img_folder_question.xml b/app/src/main/res/drawable/img_folder_question.xml
index 3ae36085e0..6e91206520 100644
--- a/app/src/main/res/drawable/img_folder_question.xml
+++ b/app/src/main/res/drawable/img_folder_question.xml
@@ -4,33 +4,42 @@
     android:viewportWidth="200"
     android:viewportHeight="201">
     <path
+        android:name="secondary"
         android:fillColor="#AAC3EF"
         android:pathData="M4.17,44.42C4.17,37.51 9.76,31.92 16.67,31.92H52.58C56.23,31.92 59.7,33.51 62.07,36.28L70.83,46.5H179.17C183.77,46.5 187.5,50.23 187.5,54.83V129.83C187.5,155.15 166.98,175.67 141.67,175.67H14.58C8.83,175.67 4.17,171 4.17,165.25V44.42Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M68.92,50.67L58.91,38.99C57.33,37.15 55.02,36.08 52.58,36.08H16.67C12.06,36.08 8.33,39.81 8.33,44.42V165.25C8.33,168.7 11.13,171.5 14.58,171.5H141.67C164.68,171.5 183.33,152.85 183.33,129.83V54.83C183.33,52.53 181.47,50.67 179.17,50.67H68.92ZM70.83,46.5L62.07,36.28C59.7,33.51 56.23,31.92 52.58,31.92H16.67C9.76,31.92 4.17,37.51 4.17,44.42V165.25C4.17,171 8.83,175.67 14.58,175.67H141.67C166.98,175.67 187.5,155.15 187.5,129.83V54.83C187.5,50.23 183.77,46.5 179.17,46.5H70.83Z" />
     <path
+        android:name="primary"
         android:fillColor="#DBE5F6"
         android:pathData="M22.96,83.58C24.15,77.76 29.27,73.58 35.21,73.58H189.79C195.07,73.58 199.01,78.42 197.96,83.58L181.21,165.67C180.02,171.49 174.9,175.67 168.96,175.67H14.37C9.1,175.67 5.15,170.83 6.21,165.67L22.96,83.58Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M189.79,77.75H35.21C31.25,77.75 27.83,80.54 27.04,84.42L10.29,166.5C9.76,169.08 11.74,171.5 14.37,171.5H168.96C172.92,171.5 176.33,168.71 177.13,164.83L193.88,82.75C194.4,80.17 192.43,77.75 189.79,77.75ZM35.21,73.58C29.27,73.58 24.15,77.76 22.96,83.58L6.21,165.67C5.15,170.83 9.1,175.67 14.37,175.67H168.96C174.9,175.67 180.02,171.49 181.21,165.67L197.96,83.58C199.01,78.42 195.07,73.58 189.79,73.58H35.21Z" />
     <path
+        android:name="tertiary"
         android:fillColor="#ffffff"
         android:pathData="M175,67.33C175,90.35 156.35,109 133.33,109C110.32,109 91.67,90.35 91.67,67.33C91.67,44.32 110.32,25.67 133.33,25.67C156.35,25.67 175,44.32 175,67.33Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M133.33,104.83C154.04,104.83 170.83,88.04 170.83,67.33C170.83,46.62 154.04,29.83 133.33,29.83C112.62,29.83 95.83,46.62 95.83,67.33C95.83,88.04 112.62,104.83 133.33,104.83ZM133.33,109C156.35,109 175,90.35 175,67.33C175,44.32 156.35,25.67 133.33,25.67C110.32,25.67 91.67,44.32 91.67,67.33C91.67,90.35 110.32,109 133.33,109Z" />
     <path
+        android:name="accent"
         android:fillColor="#FFBF00"
         android:pathData="M164.58,67.33C164.58,84.59 150.59,98.58 133.33,98.58C116.07,98.58 102.08,84.59 102.08,67.33C102.08,50.07 116.07,36.08 133.33,36.08C150.59,36.08 164.58,50.07 164.58,67.33Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:pathData="M197.93,127.93L163.54,95.46L159.38,99.62L191.85,134.01C193.46,135.71 196.16,135.75 197.82,134.09L198.01,133.91C199.67,132.25 199.63,129.54 197.93,127.93Z" />
     <path
+        android:name="outline"
         android:fillColor="#020F66"
         android:fillType="evenOdd"
         android:pathData="M128.28,71.66C128.31,72.73 129.18,73.58 130.25,73.58H131.36C132.45,73.58 133.33,72.7 133.33,71.61L133.33,69.42C139.2,69.33 143.75,66.08 143.75,60.04C143.75,53.64 139.51,50.67 133.33,50.67C127.94,50.67 123.09,54.23 122.83,59.37C122.79,60.36 123.65,61.08 124.63,61.08H125.11C126.2,61.08 127.05,60.18 127.37,59.14C128.21,56.43 130.77,54.83 133.33,54.83C136.46,54.83 139.06,56.68 139.06,60.04C139.06,65.01 133.72,65.92 129.65,66.06C128.81,66.09 128.14,66.77 128.17,67.6L128.28,71.66ZM130.73,82.96C133.03,82.96 134.9,81.56 134.9,79.83C134.9,78.11 133.03,76.71 130.73,76.71C128.43,76.71 126.56,78.11 126.56,79.83C126.56,81.56 128.43,82.96 130.73,82.96Z" />
diff --git a/app/src/main/res/drawable/img_import_logins.xml b/app/src/main/res/drawable/img_import_logins.xml
index af02d13068..4aa95b9b59 100644
--- a/app/src/main/res/drawable/img_import_logins.xml
+++ b/app/src/main/res/drawable/img_import_logins.xml
@@ -3,71 +3,88 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <group>
-    <clip-path
-        android:pathData="M0,0.67h200v200h-200z"/>
-    <path
-        android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H154.17C161.07,25.67 166.67,31.26 166.67,38.17V138.17C166.67,145.07 161.07,150.67 154.17,150.67H12.5C5.6,150.67 0,145.07 0,138.17V38.17Z"
-        android:fillColor="#AAC3EF"/>
-    <path
-        android:pathData="M154.17,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V138.17C4.17,142.77 7.9,146.5 12.5,146.5H154.17C158.77,146.5 162.5,142.77 162.5,138.17V38.17C162.5,33.56 158.77,29.83 154.17,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V138.17C0,145.07 5.6,150.67 12.5,150.67H154.17C161.07,150.67 166.67,145.07 166.67,138.17V38.17C166.67,31.26 161.07,25.67 154.17,25.67H12.5Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M164.58,50.67L2.08,50.67L2.08,46.5L164.58,46.5L164.58,50.67Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M158.33,38.17C158.33,40.47 156.47,42.33 154.17,42.33C151.87,42.33 150,40.47 150,38.17C150,35.87 151.87,34 154.17,34C156.47,34 158.33,35.87 158.33,38.17Z"
-        android:fillColor="#020F66"/>
-    <path
-        android:pathData="M145.83,38.17C145.83,40.47 143.97,42.33 141.67,42.33C139.37,42.33 137.5,40.47 137.5,38.17C137.5,35.87 139.37,34 141.67,34C143.97,34 145.83,35.87 145.83,38.17Z"
-        android:fillColor="#020F66"/>
-    <path
-        android:pathData="M133.33,38.17C133.33,40.47 131.47,42.33 129.17,42.33C126.86,42.33 125,40.47 125,38.17C125,35.87 126.86,34 129.17,34C131.47,34 133.33,35.87 133.33,38.17Z"
-        android:fillColor="#020F66"/>
-    <path
-        android:pathData="M125,67.33C125,60.43 130.6,54.83 137.5,54.83H187.5C194.4,54.83 200,60.43 200,67.33V175.67C200,182.57 194.4,188.17 187.5,188.17H137.5C130.6,188.17 125,182.57 125,175.67V67.33Z"
-        android:fillColor="#DBE5F6"/>
-    <path
-        android:pathData="M187.5,59H137.5C132.9,59 129.17,62.73 129.17,67.33V175.67C129.17,180.27 132.9,184 137.5,184H187.5C192.1,184 195.83,180.27 195.83,175.67V67.33C195.83,62.73 192.1,59 187.5,59ZM137.5,54.83C130.6,54.83 125,60.43 125,67.33V175.67C125,182.57 130.6,188.17 137.5,188.17H187.5C194.4,188.17 200,182.57 200,175.67V67.33C200,60.43 194.4,54.83 187.5,54.83H137.5Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M152.08,67.33C152.08,66.18 153.02,65.25 154.17,65.25H170.83C171.99,65.25 172.92,66.18 172.92,67.33C172.92,68.48 171.99,69.42 170.83,69.42H154.17C153.02,69.42 152.08,68.48 152.08,67.33Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M141.67,173.58C141.67,170.13 144.46,167.33 147.92,167.33H177.08C180.53,167.33 183.33,170.13 183.33,173.58V194.42C183.33,197.87 180.53,200.67 177.08,200.67H147.92C144.46,200.67 141.67,197.87 141.67,194.42V173.58Z"
-        android:fillColor="#FFBF00"/>
-    <path
-        android:pathData="M177.08,171.5H147.92C146.76,171.5 145.83,172.43 145.83,173.58V194.42C145.83,195.57 146.76,196.5 147.92,196.5H177.08C178.23,196.5 179.17,195.57 179.17,194.42V173.58C179.17,172.43 178.23,171.5 177.08,171.5ZM147.92,167.33C144.46,167.33 141.67,170.13 141.67,173.58V194.42C141.67,197.87 144.46,200.67 147.92,200.67H177.08C180.53,200.67 183.33,197.87 183.33,194.42V173.58C183.33,170.13 180.53,167.33 177.08,167.33H147.92Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M160.42,179.83C160.42,178.68 161.35,177.75 162.5,177.75C163.65,177.75 164.58,178.68 164.58,179.83V188.17C164.58,189.32 163.65,190.25 162.5,190.25C161.35,190.25 160.42,189.32 160.42,188.17V179.83Z"
-        android:fillColor="#020F66"/>
-    <path
-        android:pathData="M152.08,165.25C152.08,159.5 156.75,154.83 162.5,154.83C168.25,154.83 172.92,159.5 172.92,165.25V167.33H168.75V165.25C168.75,161.8 165.95,159 162.5,159C159.05,159 156.25,161.8 156.25,165.25V167.33H152.08V165.25Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M83.33,111.08C84.48,111.08 85.42,112.02 85.42,113.17V125.67C85.42,129.12 88.21,131.92 91.67,131.92H159.55L150.61,122.97C149.8,122.16 149.8,120.84 150.61,120.03C151.42,119.21 152.74,119.21 153.56,120.03L166.06,132.53C166.87,133.34 166.87,134.66 166.06,135.47L153.56,147.97C152.74,148.79 151.42,148.79 150.61,147.97C149.8,147.16 149.8,145.84 150.61,145.03L159.55,136.08H91.67C85.91,136.08 81.25,131.42 81.25,125.67V113.17C81.25,112.02 82.18,111.08 83.33,111.08Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M54.17,81.92C54.17,78.46 56.96,75.67 60.42,75.67H106.25C109.7,75.67 112.5,78.46 112.5,81.92V115.25C112.5,118.7 109.7,121.5 106.25,121.5H60.42C56.96,121.5 54.17,118.7 54.17,115.25V81.92Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M106.25,79.83H60.42C59.27,79.83 58.33,80.77 58.33,81.92V115.25C58.33,116.4 59.27,117.33 60.42,117.33H106.25C107.4,117.33 108.33,116.4 108.33,115.25V81.92C108.33,80.77 107.4,79.83 106.25,79.83ZM60.42,75.67C56.96,75.67 54.17,78.46 54.17,81.92V115.25C54.17,118.7 56.96,121.5 60.42,121.5H106.25C109.7,121.5 112.5,118.7 112.5,115.25V81.92C112.5,78.46 109.7,75.67 106.25,75.67H60.42Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M81.25,92.33C81.25,91.18 82.18,90.25 83.33,90.25C84.48,90.25 85.42,91.18 85.42,92.33V104.83C85.42,105.98 84.48,106.92 83.33,106.92C82.18,106.92 81.25,105.98 81.25,104.83V92.33Z"
-        android:fillColor="#020F66"/>
-    <path
-        android:pathData="M66.67,71.5C66.67,62.29 74.13,54.83 83.33,54.83C92.54,54.83 100,62.29 100,71.5V75.67H95.83V71.5C95.83,64.6 90.24,59 83.33,59C76.43,59 70.83,64.6 70.83,71.5V75.67H66.67V71.5Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-  </group>
+    <group>
+        <clip-path android:pathData="M0,0.67h200v200h-200z" />
+        <path
+            android:name="secondary"
+            android:fillColor="#AAC3EF"
+            android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H154.17C161.07,25.67 166.67,31.26 166.67,38.17V138.17C166.67,145.07 161.07,150.67 154.17,150.67H12.5C5.6,150.67 0,145.07 0,138.17V38.17Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M154.17,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V138.17C4.17,142.77 7.9,146.5 12.5,146.5H154.17C158.77,146.5 162.5,142.77 162.5,138.17V38.17C162.5,33.56 158.77,29.83 154.17,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V138.17C0,145.07 5.6,150.67 12.5,150.67H154.17C161.07,150.67 166.67,145.07 166.67,138.17V38.17C166.67,31.26 161.07,25.67 154.17,25.67H12.5Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M164.58,50.67L2.08,50.67L2.08,46.5L164.58,46.5L164.58,50.67Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:pathData="M158.33,38.17C158.33,40.47 156.47,42.33 154.17,42.33C151.87,42.33 150,40.47 150,38.17C150,35.87 151.87,34 154.17,34C156.47,34 158.33,35.87 158.33,38.17Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:pathData="M145.83,38.17C145.83,40.47 143.97,42.33 141.67,42.33C139.37,42.33 137.5,40.47 137.5,38.17C137.5,35.87 139.37,34 141.67,34C143.97,34 145.83,35.87 145.83,38.17Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:pathData="M133.33,38.17C133.33,40.47 131.47,42.33 129.17,42.33C126.86,42.33 125,40.47 125,38.17C125,35.87 126.86,34 129.17,34C131.47,34 133.33,35.87 133.33,38.17Z" />
+        <path
+            android:name="primary"
+            android:fillColor="#DBE5F6"
+            android:pathData="M125,67.33C125,60.43 130.6,54.83 137.5,54.83H187.5C194.4,54.83 200,60.43 200,67.33V175.67C200,182.57 194.4,188.17 187.5,188.17H137.5C130.6,188.17 125,182.57 125,175.67V67.33Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M187.5,59H137.5C132.9,59 129.17,62.73 129.17,67.33V175.67C129.17,180.27 132.9,184 137.5,184H187.5C192.1,184 195.83,180.27 195.83,175.67V67.33C195.83,62.73 192.1,59 187.5,59ZM137.5,54.83C130.6,54.83 125,60.43 125,67.33V175.67C125,182.57 130.6,188.17 137.5,188.17H187.5C194.4,188.17 200,182.57 200,175.67V67.33C200,60.43 194.4,54.83 187.5,54.83H137.5Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M152.08,67.33C152.08,66.18 153.02,65.25 154.17,65.25H170.83C171.99,65.25 172.92,66.18 172.92,67.33C172.92,68.48 171.99,69.42 170.83,69.42H154.17C153.02,69.42 152.08,68.48 152.08,67.33Z" />
+        <path
+            android:name="accent"
+            android:fillColor="#FFBF00"
+            android:pathData="M141.67,173.58C141.67,170.13 144.46,167.33 147.92,167.33H177.08C180.53,167.33 183.33,170.13 183.33,173.58V194.42C183.33,197.87 180.53,200.67 177.08,200.67H147.92C144.46,200.67 141.67,197.87 141.67,194.42V173.58Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M177.08,171.5H147.92C146.76,171.5 145.83,172.43 145.83,173.58V194.42C145.83,195.57 146.76,196.5 147.92,196.5H177.08C178.23,196.5 179.17,195.57 179.17,194.42V173.58C179.17,172.43 178.23,171.5 177.08,171.5ZM147.92,167.33C144.46,167.33 141.67,170.13 141.67,173.58V194.42C141.67,197.87 144.46,200.67 147.92,200.67H177.08C180.53,200.67 183.33,197.87 183.33,194.42V173.58C183.33,170.13 180.53,167.33 177.08,167.33H147.92Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:pathData="M160.42,179.83C160.42,178.68 161.35,177.75 162.5,177.75C163.65,177.75 164.58,178.68 164.58,179.83V188.17C164.58,189.32 163.65,190.25 162.5,190.25C161.35,190.25 160.42,189.32 160.42,188.17V179.83Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M152.08,165.25C152.08,159.5 156.75,154.83 162.5,154.83C168.25,154.83 172.92,159.5 172.92,165.25V167.33H168.75V165.25C168.75,161.8 165.95,159 162.5,159C159.05,159 156.25,161.8 156.25,165.25V167.33H152.08V165.25Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M83.33,111.08C84.48,111.08 85.42,112.02 85.42,113.17V125.67C85.42,129.12 88.21,131.92 91.67,131.92H159.55L150.61,122.97C149.8,122.16 149.8,120.84 150.61,120.03C151.42,119.21 152.74,119.21 153.56,120.03L166.06,132.53C166.87,133.34 166.87,134.66 166.06,135.47L153.56,147.97C152.74,148.79 151.42,148.79 150.61,147.97C149.8,147.16 149.8,145.84 150.61,145.03L159.55,136.08H91.67C85.91,136.08 81.25,131.42 81.25,125.67V113.17C81.25,112.02 82.18,111.08 83.33,111.08Z" />
+        <path
+            android:name="tertiary"
+            android:fillColor="#ffffff"
+            android:pathData="M54.17,81.92C54.17,78.46 56.96,75.67 60.42,75.67H106.25C109.7,75.67 112.5,78.46 112.5,81.92V115.25C112.5,118.7 109.7,121.5 106.25,121.5H60.42C56.96,121.5 54.17,118.7 54.17,115.25V81.92Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M106.25,79.83H60.42C59.27,79.83 58.33,80.77 58.33,81.92V115.25C58.33,116.4 59.27,117.33 60.42,117.33H106.25C107.4,117.33 108.33,116.4 108.33,115.25V81.92C108.33,80.77 107.4,79.83 106.25,79.83ZM60.42,75.67C56.96,75.67 54.17,78.46 54.17,81.92V115.25C54.17,118.7 56.96,121.5 60.42,121.5H106.25C109.7,121.5 112.5,118.7 112.5,115.25V81.92C112.5,78.46 109.7,75.67 106.25,75.67H60.42Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:pathData="M81.25,92.33C81.25,91.18 82.18,90.25 83.33,90.25C84.48,90.25 85.42,91.18 85.42,92.33V104.83C85.42,105.98 84.48,106.92 83.33,106.92C82.18,106.92 81.25,105.98 81.25,104.83V92.33Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M66.67,71.5C66.67,62.29 74.13,54.83 83.33,54.83C92.54,54.83 100,62.29 100,71.5V75.67H95.83V71.5C95.83,64.6 90.24,59 83.33,59C76.43,59 70.83,64.6 70.83,71.5V75.67H66.67V71.5Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/img_new_device_verification.xml b/app/src/main/res/drawable/img_new_device_verification.xml
index 872f7fb081..ceafa0bed7 100644
--- a/app/src/main/res/drawable/img_new_device_verification.xml
+++ b/app/src/main/res/drawable/img_new_device_verification.xml
@@ -3,47 +3,59 @@
     android:height="97dp"
     android:viewportWidth="97"
     android:viewportHeight="97">
-  <path
-      android:pathData="M4.5,39.758C4.5,38.007 5.265,36.344 6.593,35.204L45.244,2.043C47.117,0.436 49.883,0.436 51.756,2.043L90.407,35.204C91.735,36.344 92.5,38.007 92.5,39.758V89C92.5,91.209 90.709,93 88.5,93H8.5C6.291,93 4.5,91.209 4.5,89V39.758Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M90.5,89V39.758C90.5,38.591 89.99,37.482 89.105,36.722L50.453,3.561C49.33,2.597 47.67,2.597 46.547,3.561L7.895,36.722C7.01,37.482 6.5,38.591 6.5,39.758V89C6.5,90.104 7.395,91 8.5,91H88.5C89.605,91 90.5,90.104 90.5,89ZM6.593,35.204C5.265,36.344 4.5,38.007 4.5,39.758V89C4.5,91.209 6.291,93 8.5,93H88.5C90.709,93 92.5,91.209 92.5,89V39.758C92.5,38.007 91.735,36.344 90.407,35.204L51.756,2.043C49.883,0.436 47.117,0.436 45.244,2.043L6.593,35.204Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M7.452,39.248C5.933,38.091 5.867,35.827 7.316,34.584L45.244,2.043C47.117,0.436 49.883,0.436 51.756,2.043L89.684,34.584C91.133,35.827 91.067,38.091 89.548,39.248L50.923,68.655C49.492,69.745 47.508,69.745 46.077,68.655L7.452,39.248Z"
-      android:fillColor="#99BAF4"/>
-  <path
-      android:pathData="M49.712,67.064L88.336,37.656C88.843,37.271 88.865,36.516 88.382,36.102L50.453,3.561C49.33,2.597 47.67,2.597 46.547,3.561L8.618,36.102C8.135,36.516 8.157,37.271 8.664,37.656L47.289,67.064C48.004,67.609 48.996,67.609 49.712,67.064ZM7.316,34.584C5.867,35.827 5.933,38.091 7.452,39.248L46.077,68.655C47.508,69.745 49.492,69.745 50.923,68.655L89.548,39.248C91.067,38.091 91.133,35.827 89.684,34.584L51.756,2.043C49.883,0.436 47.117,0.436 45.244,2.043L7.316,34.584Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M50.875,66.004C49.463,67.046 47.537,67.046 46.125,66.004L7.094,37.195C6.65,36.868 6.023,36.962 5.695,37.406C5.368,37.851 5.462,38.477 5.906,38.805L44.937,67.613C47.055,69.176 49.945,69.176 52.063,67.613L91.094,38.805C91.538,38.477 91.633,37.851 91.305,37.406C90.977,36.962 90.351,36.868 89.906,37.195L50.875,66.004Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M15.5,12H81.5V46L49.698,69.61C48.987,70.138 48.014,70.136 47.306,69.605L15.5,45.75V12Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M79.5,14H17.5V44.75L48.506,68.005L79.5,44.994V14ZM81.5,46L49.698,69.61C48.987,70.138 48.014,70.136 47.306,69.605L15.5,45.75V12H81.5V46Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M48.5,60L70.5,72.5L48.5,85L26.5,72.5L48.5,60Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M50.924,62.104C49.492,61.013 47.508,61.013 46.076,62.104L7.106,91.796C6.667,92.13 6.039,92.046 5.705,91.606C5.37,91.167 5.455,90.539 5.894,90.205L44.864,60.514C47.012,58.877 49.988,58.877 52.136,60.514L51.544,61.291L52.136,60.514L91.106,90.205C91.545,90.539 91.63,91.167 91.296,91.606C90.961,92.046 90.333,92.13 89.894,91.796L50.924,62.104Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M26.5,36C26.5,32.134 29.634,29 33.5,29H63.5C67.366,29 70.5,32.134 70.5,36C70.5,39.866 67.366,43 63.5,43H33.5C29.634,43 26.5,39.866 26.5,36Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M63.5,31H33.5C30.739,31 28.5,33.239 28.5,36C28.5,38.761 30.739,41 33.5,41H63.5C66.261,41 68.5,38.761 68.5,36C68.5,33.239 66.261,31 63.5,31ZM33.5,29C29.634,29 26.5,32.134 26.5,36C26.5,39.866 29.634,43 33.5,43H63.5C67.366,43 70.5,39.866 70.5,36C70.5,32.134 67.366,29 63.5,29H33.5Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M33.5,38C34.605,38 35.5,37.105 35.5,36C35.5,34.895 34.605,34 33.5,34C32.395,34 31.5,34.895 31.5,36C31.5,37.105 32.395,38 33.5,38ZM39.5,38C40.605,38 41.5,37.105 41.5,36C41.5,34.895 40.605,34 39.5,34C38.395,34 37.5,34.895 37.5,36C37.5,37.105 38.395,38 39.5,38ZM47.5,36C47.5,37.105 46.605,38 45.5,38C44.395,38 43.5,37.105 43.5,36C43.5,34.895 44.395,34 45.5,34C46.605,34 47.5,34.895 47.5,36ZM51.5,38C52.605,38 53.5,37.105 53.5,36C53.5,34.895 52.605,34 51.5,34C50.395,34 49.5,34.895 49.5,36C49.5,37.105 50.395,38 51.5,38ZM59.5,36C59.5,37.105 58.605,38 57.5,38C56.395,38 55.5,37.105 55.5,36C55.5,34.895 56.395,34 57.5,34C58.605,34 59.5,34.895 59.5,36ZM63.5,38C64.605,38 65.5,37.105 65.5,36C65.5,34.895 64.605,34 63.5,34C62.395,34 61.5,34.895 61.5,36C61.5,37.105 62.395,38 63.5,38Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M4.5,39.758C4.5,38.007 5.265,36.344 6.593,35.204L45.244,2.043C47.117,0.436 49.883,0.436 51.756,2.043L90.407,35.204C91.735,36.344 92.5,38.007 92.5,39.758V89C92.5,91.209 90.709,93 88.5,93H8.5C6.291,93 4.5,91.209 4.5,89V39.758Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M90.5,89V39.758C90.5,38.591 89.99,37.482 89.105,36.722L50.453,3.561C49.33,2.597 47.67,2.597 46.547,3.561L7.895,36.722C7.01,37.482 6.5,38.591 6.5,39.758V89C6.5,90.104 7.395,91 8.5,91H88.5C89.605,91 90.5,90.104 90.5,89ZM6.593,35.204C5.265,36.344 4.5,38.007 4.5,39.758V89C4.5,91.209 6.291,93 8.5,93H88.5C90.709,93 92.5,91.209 92.5,89V39.758C92.5,38.007 91.735,36.344 90.407,35.204L51.756,2.043C49.883,0.436 47.117,0.436 45.244,2.043L6.593,35.204Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M7.452,39.248C5.933,38.091 5.867,35.827 7.316,34.584L45.244,2.043C47.117,0.436 49.883,0.436 51.756,2.043L89.684,34.584C91.133,35.827 91.067,38.091 89.548,39.248L50.923,68.655C49.492,69.745 47.508,69.745 46.077,68.655L7.452,39.248Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M49.712,67.064L88.336,37.656C88.843,37.271 88.865,36.516 88.382,36.102L50.453,3.561C49.33,2.597 47.67,2.597 46.547,3.561L8.618,36.102C8.135,36.516 8.157,37.271 8.664,37.656L47.289,67.064C48.004,67.609 48.996,67.609 49.712,67.064ZM7.316,34.584C5.867,35.827 5.933,38.091 7.452,39.248L46.077,68.655C47.508,69.745 49.492,69.745 50.923,68.655L89.548,39.248C91.067,38.091 91.133,35.827 89.684,34.584L51.756,2.043C49.883,0.436 47.117,0.436 45.244,2.043L7.316,34.584Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M50.875,66.004C49.463,67.046 47.537,67.046 46.125,66.004L7.094,37.195C6.65,36.868 6.023,36.962 5.695,37.406C5.368,37.851 5.462,38.477 5.906,38.805L44.937,67.613C47.055,69.176 49.945,69.176 52.063,67.613L91.094,38.805C91.538,38.477 91.633,37.851 91.305,37.406C90.977,36.962 90.351,36.868 89.906,37.195L50.875,66.004Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M15.5,12H81.5V46L49.698,69.61C48.987,70.138 48.014,70.136 47.306,69.605L15.5,45.75V12Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M79.5,14H17.5V44.75L48.506,68.005L79.5,44.994V14ZM81.5,46L49.698,69.61C48.987,70.138 48.014,70.136 47.306,69.605L15.5,45.75V12H81.5V46Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M48.5,60L70.5,72.5L48.5,85L26.5,72.5L48.5,60Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M50.924,62.104C49.492,61.013 47.508,61.013 46.076,62.104L7.106,91.796C6.667,92.13 6.039,92.046 5.705,91.606C5.37,91.167 5.455,90.539 5.894,90.205L44.864,60.514C47.012,58.877 49.988,58.877 52.136,60.514L51.544,61.291L52.136,60.514L91.106,90.205C91.545,90.539 91.63,91.167 91.296,91.606C90.961,92.046 90.333,92.13 89.894,91.796L50.924,62.104Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M26.5,36C26.5,32.134 29.634,29 33.5,29H63.5C67.366,29 70.5,32.134 70.5,36C70.5,39.866 67.366,43 63.5,43H33.5C29.634,43 26.5,39.866 26.5,36Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M63.5,31H33.5C30.739,31 28.5,33.239 28.5,36C28.5,38.761 30.739,41 33.5,41H63.5C66.261,41 68.5,38.761 68.5,36C68.5,33.239 66.261,31 63.5,31ZM33.5,29C29.634,29 26.5,32.134 26.5,36C26.5,39.866 29.634,43 33.5,43H63.5C67.366,43 70.5,39.866 70.5,36C70.5,32.134 67.366,29 63.5,29H33.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M33.5,38C34.605,38 35.5,37.105 35.5,36C35.5,34.895 34.605,34 33.5,34C32.395,34 31.5,34.895 31.5,36C31.5,37.105 32.395,38 33.5,38ZM39.5,38C40.605,38 41.5,37.105 41.5,36C41.5,34.895 40.605,34 39.5,34C38.395,34 37.5,34.895 37.5,36C37.5,37.105 38.395,38 39.5,38ZM47.5,36C47.5,37.105 46.605,38 45.5,38C44.395,38 43.5,37.105 43.5,36C43.5,34.895 44.395,34 45.5,34C46.605,34 47.5,34.895 47.5,36ZM51.5,38C52.605,38 53.5,37.105 53.5,36C53.5,34.895 52.605,34 51.5,34C50.395,34 49.5,34.895 49.5,36C49.5,37.105 50.395,38 51.5,38ZM59.5,36C59.5,37.105 58.605,38 57.5,38C56.395,38 55.5,37.105 55.5,36C55.5,34.895 56.395,34 57.5,34C58.605,34 59.5,34.895 59.5,36ZM63.5,38C64.605,38 65.5,37.105 65.5,36C65.5,34.895 64.605,34 63.5,34C62.395,34 61.5,34.895 61.5,36C61.5,37.105 62.395,38 63.5,38Z" />
 </vector>
diff --git a/app/src/main/res/drawable/img_secure_devices.xml b/app/src/main/res/drawable/img_secure_devices.xml
index 5159d99bd9..c8e763f2b5 100644
--- a/app/src/main/res/drawable/img_secure_devices.xml
+++ b/app/src/main/res/drawable/img_secure_devices.xml
@@ -3,75 +3,93 @@
     android:height="200dp"
     android:viewportWidth="200"
     android:viewportHeight="200">
-  <group>
-    <clip-path
-        android:pathData="M0,0.67h200v200h-200z"/>
-    <path
-        android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z"
-        android:fillColor="#DBE5F6"/>
-    <path
-        android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z"
-        android:fillColor="#AAC3EF"/>
-    <path
-        android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z"
-        android:fillColor="#DBE5F6"/>
-    <path
-        android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M100,115.25C118.41,115.25 133.33,100.33 133.33,81.92C133.33,63.51 118.41,48.58 100,48.58C81.59,48.58 66.67,63.51 66.67,81.92C66.67,100.33 81.59,115.25 100,115.25ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-        android:fillColor="#DBE5F6"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M79.17,75.67C79.17,72.21 81.96,69.42 85.42,69.42H114.58C118.03,69.42 120.83,72.21 120.83,75.67V96.5C120.83,99.95 118.03,102.75 114.58,102.75H85.42C81.96,102.75 79.17,99.95 79.17,96.5V75.67Z"
-        android:fillColor="#FFBF00"/>
-    <path
-        android:pathData="M114.58,73.58H85.42C84.27,73.58 83.33,74.52 83.33,75.67V96.5C83.33,97.65 84.27,98.58 85.42,98.58H114.58C115.73,98.58 116.67,97.65 116.67,96.5V75.67C116.67,74.52 115.73,73.58 114.58,73.58ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M97.92,81.92C97.92,80.77 98.85,79.83 100,79.83C101.15,79.83 102.08,80.77 102.08,81.92V90.25C102.08,91.4 101.15,92.33 100,92.33C98.85,92.33 97.92,91.4 97.92,90.25V81.92Z"
-        android:fillColor="#020F66"/>
-    <path
-        android:pathData="M89.58,67.33C89.58,61.58 94.25,56.92 100,56.92C105.75,56.92 110.42,61.58 110.42,67.33V69.42H106.25V67.33C106.25,63.88 103.45,61.08 100,61.08C96.55,61.08 93.75,63.88 93.75,67.33V69.42H89.58V67.33Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z"
-        android:fillColor="#ffffff"/>
-    <path
-        android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z"
-        android:fillColor="#AAC3EF"/>
-    <path
-        android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z"
-        android:fillColor="#020F66"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z"
-        android:fillColor="#AAC3EF"/>
-  </group>
+    <group>
+        <clip-path android:pathData="M0,0.67h200v200h-200z" />
+        <path
+            android:name="primary"
+            android:fillColor="#DBE5F6"
+            android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z" />
+        <path
+            android:name="secondary"
+            android:fillColor="#AAC3EF"
+            android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z" />
+        <path
+            android:name="primary"
+            android:fillColor="#DBE5F6"
+            android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z" />
+        <path
+            android:name="tertiary"
+            android:fillColor="#ffffff"
+            android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z" />
+        <path
+            android:name="primary"
+            android:fillColor="#DBE5F6"
+            android:fillType="evenOdd"
+            android:pathData="M100,115.25C118.41,115.25 133.33,100.33 133.33,81.92C133.33,63.51 118.41,48.58 100,48.58C81.59,48.58 66.67,63.51 66.67,81.92C66.67,100.33 81.59,115.25 100,115.25ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z" />
+        <path
+            android:name="accent"
+            android:fillColor="#FFBF00"
+            android:pathData="M79.17,75.67C79.17,72.21 81.96,69.42 85.42,69.42H114.58C118.03,69.42 120.83,72.21 120.83,75.67V96.5C120.83,99.95 118.03,102.75 114.58,102.75H85.42C81.96,102.75 79.17,99.95 79.17,96.5V75.67Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M114.58,73.58H85.42C84.27,73.58 83.33,74.52 83.33,75.67V96.5C83.33,97.65 84.27,98.58 85.42,98.58H114.58C115.73,98.58 116.67,97.65 116.67,96.5V75.67C116.67,74.52 115.73,73.58 114.58,73.58ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:pathData="M97.92,81.92C97.92,80.77 98.85,79.83 100,79.83C101.15,79.83 102.08,80.77 102.08,81.92V90.25C102.08,91.4 101.15,92.33 100,92.33C98.85,92.33 97.92,91.4 97.92,90.25V81.92Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M89.58,67.33C89.58,61.58 94.25,56.92 100,56.92C105.75,56.92 110.42,61.58 110.42,67.33V69.42H106.25V67.33C106.25,63.88 103.45,61.08 100,61.08C96.55,61.08 93.75,63.88 93.75,67.33V69.42H89.58V67.33Z" />
+        <path
+            android:name="tertiary"
+            android:fillColor="#ffffff"
+            android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z" />
+        <path
+            android:name="secondary"
+            android:fillColor="#AAC3EF"
+            android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z" />
+        <path
+            android:name="outline"
+            android:fillColor="#020F66"
+            android:fillType="evenOdd"
+            android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z" />
+        <path
+            android:name="secondary"
+            android:fillColor="#AAC3EF"
+            android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/img_send.xml b/app/src/main/res/drawable/img_send.xml
index 8dec7b8a51..0af9ba48b8 100644
--- a/app/src/main/res/drawable/img_send.xml
+++ b/app/src/main/res/drawable/img_send.xml
@@ -3,50 +3,63 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M139.58,25.67C141.88,25.67 143.75,27.53 143.75,29.83L143.75,188.17C143.75,190.47 141.88,192.33 139.58,192.33L22.92,192.33C20.62,192.33 18.75,190.47 18.75,188.17L18.75,29.83C18.75,27.53 20.62,25.67 22.92,25.67L139.58,25.67Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M139.58,188.17L139.58,29.83L22.92,29.83L22.92,188.17L139.58,188.17ZM143.75,29.83C143.75,27.53 141.88,25.67 139.58,25.67L22.92,25.67C20.62,25.67 18.75,27.53 18.75,29.83L18.75,188.17C18.75,190.47 20.62,192.33 22.92,192.33L139.58,192.33C141.88,192.33 143.75,190.47 143.75,188.17L143.75,29.83Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M160.42,171.5L160.42,13.17C160.42,10.87 158.55,9 156.25,9L67.35,9C66.25,9 65.19,9.43 64.41,10.21L36.63,37.99C35.85,38.77 35.42,39.83 35.42,40.93L35.42,171.5C35.42,173.8 37.28,175.67 39.58,175.67L156.25,175.67C158.55,175.67 160.42,173.8 160.42,171.5Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M156.25,171.5L156.25,13.17L67.35,13.17L39.58,40.93L39.58,171.5L156.25,171.5ZM67.36,13.16C67.36,13.16 67.36,13.16 67.36,13.16L67.36,13.16ZM160.42,13.17L160.42,171.5C160.42,173.8 158.55,175.67 156.25,175.67L39.58,175.67C37.28,175.67 35.42,173.8 35.42,171.5L35.42,40.93C35.42,39.83 35.85,38.77 36.63,37.99L64.41,10.21C65.19,9.43 66.25,9 67.35,9L156.25,9C158.55,9 160.42,10.87 160.42,13.17Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M68.75,11.08C69.9,11.08 70.83,12.02 70.83,13.17V44.42H39.58C38.43,44.42 37.5,43.48 37.5,42.33C37.5,41.18 38.43,40.25 39.58,40.25H66.67V13.17C66.67,12.02 67.6,11.08 68.75,11.08Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M77.08,73.58C77.08,70.13 79.88,67.33 83.33,67.33H112.5C115.95,67.33 118.75,70.13 118.75,73.58V94.42C118.75,97.87 115.95,100.67 112.5,100.67H83.33C79.88,100.67 77.08,97.87 77.08,94.42V73.58Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M112.5,71.5H83.33C82.18,71.5 81.25,72.43 81.25,73.58V94.42C81.25,95.57 82.18,96.5 83.33,96.5H112.5C113.65,96.5 114.58,95.57 114.58,94.42V73.58C114.58,72.43 113.65,71.5 112.5,71.5ZM83.33,67.33C79.88,67.33 77.08,70.13 77.08,73.58V94.42C77.08,97.87 79.88,100.67 83.33,100.67H112.5C115.95,100.67 118.75,97.87 118.75,94.42V73.58C118.75,70.13 115.95,67.33 112.5,67.33H83.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M95.83,79.83C95.83,78.68 96.77,77.75 97.92,77.75C99.07,77.75 100,78.68 100,79.83V88.17C100,89.32 99.07,90.25 97.92,90.25C96.77,90.25 95.83,89.32 95.83,88.17V79.83Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M87.5,65.25C87.5,59.5 92.16,54.83 97.92,54.83C103.67,54.83 108.33,59.5 108.33,65.25V67.33H104.17V65.25C104.17,61.8 101.37,59 97.92,59C94.46,59 91.67,61.8 91.67,65.25V67.33H87.5V65.25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M129.17,192.45V163.17L154.17,176.5L136.13,195.26C135.37,196.05 134.31,196.5 133.21,196.5C130.98,196.5 129.17,194.69 129.17,192.45Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M127.08,159.69L157.58,175.96L137.63,196.7C136.48,197.9 134.88,198.58 133.21,198.58C129.83,198.58 127.08,195.84 127.08,192.45V159.69ZM131.25,166.64V192.45C131.25,193.54 132.13,194.42 133.21,194.42C133.75,194.42 134.26,194.2 134.63,193.81L150.76,177.04L131.25,166.64Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M88.64,138.11L184.03,93.46C187.69,91.74 191.83,94.68 191.42,98.71L181.82,191.72C181.41,195.7 176.85,197.75 173.6,195.42L130.21,164.21L88.92,147.66C84.69,145.96 84.52,140.04 88.64,138.11Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M189.35,98.49C189.6,96.08 187.11,94.31 184.91,95.34L89.53,139.99C87.05,141.15 87.15,144.71 89.69,145.73L129.62,161.73L156.42,131.28C157.18,130.42 158.5,130.34 159.36,131.1C160.23,131.86 160.31,133.17 159.55,134.04L133.29,163.86L174.82,193.73C176.77,195.13 179.51,193.9 179.75,191.51L189.35,98.49ZM129.2,166.05L88.14,149.59C82.22,147.22 81.99,138.93 87.76,136.22L183.15,91.57C188.28,89.17 194.07,93.28 193.49,98.92L183.9,191.94C183.32,197.51 176.94,200.38 172.39,197.11L129.2,166.05Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M139.58,25.67C141.88,25.67 143.75,27.53 143.75,29.83L143.75,188.17C143.75,190.47 141.88,192.33 139.58,192.33L22.92,192.33C20.62,192.33 18.75,190.47 18.75,188.17L18.75,29.83C18.75,27.53 20.62,25.67 22.92,25.67L139.58,25.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M139.58,188.17L139.58,29.83L22.92,29.83L22.92,188.17L139.58,188.17ZM143.75,29.83C143.75,27.53 141.88,25.67 139.58,25.67L22.92,25.67C20.62,25.67 18.75,27.53 18.75,29.83L18.75,188.17C18.75,190.47 20.62,192.33 22.92,192.33L139.58,192.33C141.88,192.33 143.75,190.47 143.75,188.17L143.75,29.83Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M160.42,171.5L160.42,13.17C160.42,10.87 158.55,9 156.25,9L67.35,9C66.25,9 65.19,9.43 64.41,10.21L36.63,37.99C35.85,38.77 35.42,39.83 35.42,40.93L35.42,171.5C35.42,173.8 37.28,175.67 39.58,175.67L156.25,175.67C158.55,175.67 160.42,173.8 160.42,171.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M156.25,171.5L156.25,13.17L67.35,13.17L39.58,40.93L39.58,171.5L156.25,171.5ZM67.36,13.16C67.36,13.16 67.36,13.16 67.36,13.16L67.36,13.16ZM160.42,13.17L160.42,171.5C160.42,173.8 158.55,175.67 156.25,175.67L39.58,175.67C37.28,175.67 35.42,173.8 35.42,171.5L35.42,40.93C35.42,39.83 35.85,38.77 36.63,37.99L64.41,10.21C65.19,9.43 66.25,9 67.35,9L156.25,9C158.55,9 160.42,10.87 160.42,13.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M68.75,11.08C69.9,11.08 70.83,12.02 70.83,13.17V44.42H39.58C38.43,44.42 37.5,43.48 37.5,42.33C37.5,41.18 38.43,40.25 39.58,40.25H66.67V13.17C66.67,12.02 67.6,11.08 68.75,11.08Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M77.08,73.58C77.08,70.13 79.88,67.33 83.33,67.33H112.5C115.95,67.33 118.75,70.13 118.75,73.58V94.42C118.75,97.87 115.95,100.67 112.5,100.67H83.33C79.88,100.67 77.08,97.87 77.08,94.42V73.58Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M112.5,71.5H83.33C82.18,71.5 81.25,72.43 81.25,73.58V94.42C81.25,95.57 82.18,96.5 83.33,96.5H112.5C113.65,96.5 114.58,95.57 114.58,94.42V73.58C114.58,72.43 113.65,71.5 112.5,71.5ZM83.33,67.33C79.88,67.33 77.08,70.13 77.08,73.58V94.42C77.08,97.87 79.88,100.67 83.33,100.67H112.5C115.95,100.67 118.75,97.87 118.75,94.42V73.58C118.75,70.13 115.95,67.33 112.5,67.33H83.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M95.83,79.83C95.83,78.68 96.77,77.75 97.92,77.75C99.07,77.75 100,78.68 100,79.83V88.17C100,89.32 99.07,90.25 97.92,90.25C96.77,90.25 95.83,89.32 95.83,88.17V79.83Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M87.5,65.25C87.5,59.5 92.16,54.83 97.92,54.83C103.67,54.83 108.33,59.5 108.33,65.25V67.33H104.17V65.25C104.17,61.8 101.37,59 97.92,59C94.46,59 91.67,61.8 91.67,65.25V67.33H87.5V65.25Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M129.17,192.45V163.17L154.17,176.5L136.13,195.26C135.37,196.05 134.31,196.5 133.21,196.5C130.98,196.5 129.17,194.69 129.17,192.45Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M127.08,159.69L157.58,175.96L137.63,196.7C136.48,197.9 134.88,198.58 133.21,198.58C129.83,198.58 127.08,195.84 127.08,192.45V159.69ZM131.25,166.64V192.45C131.25,193.54 132.13,194.42 133.21,194.42C133.75,194.42 134.26,194.2 134.63,193.81L150.76,177.04L131.25,166.64Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M88.64,138.11L184.03,93.46C187.69,91.74 191.83,94.68 191.42,98.71L181.82,191.72C181.41,195.7 176.85,197.75 173.6,195.42L130.21,164.21L88.92,147.66C84.69,145.96 84.52,140.04 88.64,138.11Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M189.35,98.49C189.6,96.08 187.11,94.31 184.91,95.34L89.53,139.99C87.05,141.15 87.15,144.71 89.69,145.73L129.62,161.73L156.42,131.28C157.18,130.42 158.5,130.34 159.36,131.1C160.23,131.86 160.31,133.17 159.55,134.04L133.29,163.86L174.82,193.73C176.77,195.13 179.51,193.9 179.75,191.51L189.35,98.49ZM129.2,166.05L88.14,149.59C82.22,147.22 81.99,138.93 87.76,136.22L183.15,91.57C188.28,89.17 194.07,93.28 193.49,98.92L183.9,191.94C183.32,197.51 176.94,200.38 172.39,197.11L129.2,166.05Z" />
 </vector>
diff --git a/app/src/main/res/drawable/img_setup_complete.xml b/app/src/main/res/drawable/img_setup_complete.xml
index 659dd784e6..e489f28809 100644
--- a/app/src/main/res/drawable/img_setup_complete.xml
+++ b/app/src/main/res/drawable/img_setup_complete.xml
@@ -3,59 +3,74 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M0,42.33C0,33.13 7.46,25.67 16.67,25.67H183.33C192.54,25.67 200,33.13 200,42.33V159C200,168.21 192.54,175.67 183.33,175.67H16.67C7.46,175.67 0,168.21 0,159V42.33Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M183.33,29.83H16.67C9.76,29.83 4.17,35.43 4.17,42.33V159C4.17,165.9 9.76,171.5 16.67,171.5H183.33C190.24,171.5 195.83,165.9 195.83,159V42.33C195.83,35.43 190.24,29.83 183.33,29.83ZM16.67,25.67C7.46,25.67 0,33.13 0,42.33V159C0,168.21 7.46,175.67 16.67,175.67H183.33C192.54,175.67 200,168.21 200,159V42.33C200,33.13 192.54,25.67 183.33,25.67H16.67Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,56.92C18.75,54.62 20.62,52.75 22.92,52.75H177.08C179.38,52.75 181.25,54.62 181.25,56.92V81.92C181.25,84.22 179.38,86.08 177.08,86.08H22.92C20.62,86.08 18.75,84.22 18.75,81.92V56.92Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M177.08,56.92H22.92L22.92,81.92H177.08V56.92ZM22.92,52.75C20.62,52.75 18.75,54.62 18.75,56.92V81.92C18.75,84.22 20.62,86.08 22.92,86.08H177.08C179.38,86.08 181.25,84.22 181.25,81.92V56.92C181.25,54.62 179.38,52.75 177.08,52.75H22.92Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,119.42C18.75,117.11 20.62,115.25 22.92,115.25H177.08C179.38,115.25 181.25,117.11 181.25,119.42V144.42C181.25,146.72 179.38,148.58 177.08,148.58H22.92C20.62,148.58 18.75,146.72 18.75,144.42V119.42Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M177.08,119.42H22.92L22.92,144.42H177.08V119.42ZM22.92,115.25C20.62,115.25 18.75,117.11 18.75,119.42V144.42C18.75,146.72 20.62,148.58 22.92,148.58H177.08C179.38,148.58 181.25,146.72 181.25,144.42V119.42C181.25,117.11 179.38,115.25 177.08,115.25H22.92Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M35.42,124.78C36.58,124.78 37.51,125.71 37.51,126.86V129.78L40.24,128.88C41.33,128.52 42.51,129.12 42.87,130.21C43.23,131.31 42.63,132.48 41.54,132.84L38.77,133.75L40.5,136.18C41.17,137.12 40.95,138.42 40.02,139.08C39.08,139.75 37.78,139.54 37.11,138.6L35.42,136.24L33.74,138.6C33.07,139.54 31.77,139.75 30.83,139.09C29.89,138.42 29.68,137.12 30.35,136.18L32.08,133.75L29.31,132.84C28.22,132.48 27.62,131.31 27.98,130.21C28.34,129.12 29.51,128.52 30.61,128.88L33.34,129.78V126.86C33.34,125.71 34.27,124.78 35.42,124.78ZM54.17,124.78C55.33,124.78 56.26,125.71 56.26,126.86V129.78L58.99,128.88C60.08,128.52 61.26,129.12 61.62,130.21C61.98,131.31 61.38,132.48 60.29,132.84L57.52,133.75L59.25,136.18C59.92,137.12 59.7,138.42 58.77,139.08C57.83,139.75 56.53,139.54 55.86,138.6L54.17,136.24L52.49,138.6C51.82,139.54 50.52,139.75 49.58,139.09C48.64,138.42 48.43,137.12 49.1,136.18L50.83,133.75L48.06,132.84C46.97,132.48 46.37,131.31 46.73,130.21C47.09,129.12 48.26,128.52 49.36,128.88L52.09,129.78V126.86C52.09,125.71 53.02,124.78 54.17,124.78ZM72.92,124.78C74.08,124.78 75.01,125.71 75.01,126.86V129.78L77.74,128.88C78.83,128.52 80.01,129.12 80.37,130.21C80.73,131.31 80.13,132.48 79.04,132.84L76.27,133.75L78,136.18C78.67,137.12 78.45,138.42 77.52,139.08C76.58,139.75 75.28,139.54 74.61,138.6L72.92,136.24L71.24,138.6C70.57,139.54 69.27,139.75 68.33,139.09C67.39,138.42 67.18,137.12 67.85,136.18L69.58,133.75L66.81,132.84C65.72,132.48 65.12,131.31 65.48,130.21C65.84,129.12 67.01,128.52 68.11,128.88L70.84,129.78V126.86C70.84,125.71 71.77,124.78 72.92,124.78ZM91.67,124.78C92.83,124.78 93.76,125.71 93.76,126.86V129.78L96.49,128.88C97.58,128.52 98.76,129.12 99.12,130.21C99.48,131.31 98.88,132.48 97.79,132.84L95.02,133.75L96.75,136.18C97.42,137.12 97.2,138.42 96.27,139.08C95.33,139.75 94.03,139.54 93.36,138.6L91.67,136.24L89.99,138.6C89.32,139.54 88.02,139.75 87.08,139.09C86.14,138.42 85.93,137.12 86.6,136.18L88.33,133.75L85.56,132.84C84.47,132.48 83.87,131.31 84.23,130.21C84.59,129.12 85.76,128.52 86.86,128.88L89.59,129.78V126.86C89.59,125.71 90.52,124.78 91.67,124.78ZM110.43,124.78C111.57,124.78 112.51,125.71 112.51,126.86V129.78L115.24,128.88C116.33,128.52 117.51,129.12 117.87,130.21C118.23,131.31 117.63,132.48 116.54,132.84L113.77,133.75L115.5,136.18C116.17,137.12 115.96,138.42 115.02,139.08C114.08,139.75 112.78,139.54 112.11,138.6L110.43,136.24L108.74,138.6C108.07,139.54 106.77,139.75 105.83,139.09C104.89,138.42 104.68,137.12 105.35,136.18L107.08,133.75L104.31,132.84C103.22,132.48 102.62,131.31 102.98,130.21C103.34,129.12 104.51,128.52 105.61,128.88L108.34,129.78V126.86C108.34,125.71 109.27,124.78 110.43,124.78Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M29.17,69.42C29.17,68.27 30.1,67.33 31.25,67.33L114.58,67.33C115.73,67.33 116.67,68.27 116.67,69.42C116.67,70.57 115.73,71.5 114.58,71.5L31.25,71.5C30.1,71.5 29.17,70.57 29.17,69.42Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M170.22,61.69C171.04,62.51 171.04,63.83 170.22,64.64L157.72,77.14C156.91,77.95 155.59,77.95 154.78,77.14L148.53,70.89C147.71,70.08 147.71,68.76 148.53,67.94C149.34,67.13 150.66,67.13 151.47,67.94L156.25,72.72L167.28,61.69C168.09,60.88 169.41,60.88 170.22,61.69Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M191.67,131.92C191.67,145.72 180.47,156.92 166.67,156.92C152.86,156.92 141.67,145.72 141.67,131.92C141.67,118.11 152.86,106.92 166.67,106.92C180.47,106.92 191.67,118.11 191.67,131.92Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M166.67,152.75C178.17,152.75 187.5,143.42 187.5,131.92C187.5,120.41 178.17,111.08 166.67,111.08C155.16,111.08 145.83,120.41 145.83,131.92C145.83,143.42 155.16,152.75 166.67,152.75ZM166.67,156.92C180.47,156.92 191.67,145.72 191.67,131.92C191.67,118.11 180.47,106.92 166.67,106.92C152.86,106.92 141.67,118.11 141.67,131.92C141.67,145.72 152.86,156.92 166.67,156.92Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M178.56,124.19C179.37,125.01 179.37,126.33 178.56,127.14L163.97,141.72C163.16,142.54 161.84,142.54 161.03,141.72L154.78,135.47C153.96,134.66 153.96,133.34 154.78,132.53C155.59,131.71 156.91,131.71 157.72,132.53L162.5,137.3L175.61,124.19C176.42,123.38 177.74,123.38 178.56,124.19Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M191.67,69.42C191.67,83.22 180.47,94.42 166.67,94.42C152.86,94.42 141.67,83.22 141.67,69.42C141.67,55.61 152.86,44.42 166.67,44.42C180.47,44.42 191.67,55.61 191.67,69.42Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M166.67,90.25C178.17,90.25 187.5,80.92 187.5,69.42C187.5,57.91 178.17,48.58 166.67,48.58C155.16,48.58 145.83,57.91 145.83,69.42C145.83,80.92 155.16,90.25 166.67,90.25ZM166.67,94.42C180.47,94.42 191.67,83.22 191.67,69.42C191.67,55.61 180.47,44.42 166.67,44.42C152.86,44.42 141.67,55.61 141.67,69.42C141.67,83.22 152.86,94.42 166.67,94.42Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M178.56,61.69C179.37,62.51 179.37,63.83 178.56,64.64L163.97,79.22C163.16,80.04 161.84,80.04 161.03,79.22L154.78,72.97C153.96,72.16 153.96,70.84 154.78,70.03C155.59,69.21 156.91,69.21 157.72,70.03L162.5,74.8L175.61,61.69C176.42,60.88 177.74,60.88 178.56,61.69Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M0,42.33C0,33.13 7.46,25.67 16.67,25.67H183.33C192.54,25.67 200,33.13 200,42.33V159C200,168.21 192.54,175.67 183.33,175.67H16.67C7.46,175.67 0,168.21 0,159V42.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M183.33,29.83H16.67C9.76,29.83 4.17,35.43 4.17,42.33V159C4.17,165.9 9.76,171.5 16.67,171.5H183.33C190.24,171.5 195.83,165.9 195.83,159V42.33C195.83,35.43 190.24,29.83 183.33,29.83ZM16.67,25.67C7.46,25.67 0,33.13 0,42.33V159C0,168.21 7.46,175.67 16.67,175.67H183.33C192.54,175.67 200,168.21 200,159V42.33C200,33.13 192.54,25.67 183.33,25.67H16.67Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M18.75,56.92C18.75,54.62 20.62,52.75 22.92,52.75H177.08C179.38,52.75 181.25,54.62 181.25,56.92V81.92C181.25,84.22 179.38,86.08 177.08,86.08H22.92C20.62,86.08 18.75,84.22 18.75,81.92V56.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M177.08,56.92H22.92L22.92,81.92H177.08V56.92ZM22.92,52.75C20.62,52.75 18.75,54.62 18.75,56.92V81.92C18.75,84.22 20.62,86.08 22.92,86.08H177.08C179.38,86.08 181.25,84.22 181.25,81.92V56.92C181.25,54.62 179.38,52.75 177.08,52.75H22.92Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M18.75,119.42C18.75,117.11 20.62,115.25 22.92,115.25H177.08C179.38,115.25 181.25,117.11 181.25,119.42V144.42C181.25,146.72 179.38,148.58 177.08,148.58H22.92C20.62,148.58 18.75,146.72 18.75,144.42V119.42Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M177.08,119.42H22.92L22.92,144.42H177.08V119.42ZM22.92,115.25C20.62,115.25 18.75,117.11 18.75,119.42V144.42C18.75,146.72 20.62,148.58 22.92,148.58H177.08C179.38,148.58 181.25,146.72 181.25,144.42V119.42C181.25,117.11 179.38,115.25 177.08,115.25H22.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M35.42,124.78C36.58,124.78 37.51,125.71 37.51,126.86V129.78L40.24,128.88C41.33,128.52 42.51,129.12 42.87,130.21C43.23,131.31 42.63,132.48 41.54,132.84L38.77,133.75L40.5,136.18C41.17,137.12 40.95,138.42 40.02,139.08C39.08,139.75 37.78,139.54 37.11,138.6L35.42,136.24L33.74,138.6C33.07,139.54 31.77,139.75 30.83,139.09C29.89,138.42 29.68,137.12 30.35,136.18L32.08,133.75L29.31,132.84C28.22,132.48 27.62,131.31 27.98,130.21C28.34,129.12 29.51,128.52 30.61,128.88L33.34,129.78V126.86C33.34,125.71 34.27,124.78 35.42,124.78ZM54.17,124.78C55.33,124.78 56.26,125.71 56.26,126.86V129.78L58.99,128.88C60.08,128.52 61.26,129.12 61.62,130.21C61.98,131.31 61.38,132.48 60.29,132.84L57.52,133.75L59.25,136.18C59.92,137.12 59.7,138.42 58.77,139.08C57.83,139.75 56.53,139.54 55.86,138.6L54.17,136.24L52.49,138.6C51.82,139.54 50.52,139.75 49.58,139.09C48.64,138.42 48.43,137.12 49.1,136.18L50.83,133.75L48.06,132.84C46.97,132.48 46.37,131.31 46.73,130.21C47.09,129.12 48.26,128.52 49.36,128.88L52.09,129.78V126.86C52.09,125.71 53.02,124.78 54.17,124.78ZM72.92,124.78C74.08,124.78 75.01,125.71 75.01,126.86V129.78L77.74,128.88C78.83,128.52 80.01,129.12 80.37,130.21C80.73,131.31 80.13,132.48 79.04,132.84L76.27,133.75L78,136.18C78.67,137.12 78.45,138.42 77.52,139.08C76.58,139.75 75.28,139.54 74.61,138.6L72.92,136.24L71.24,138.6C70.57,139.54 69.27,139.75 68.33,139.09C67.39,138.42 67.18,137.12 67.85,136.18L69.58,133.75L66.81,132.84C65.72,132.48 65.12,131.31 65.48,130.21C65.84,129.12 67.01,128.52 68.11,128.88L70.84,129.78V126.86C70.84,125.71 71.77,124.78 72.92,124.78ZM91.67,124.78C92.83,124.78 93.76,125.71 93.76,126.86V129.78L96.49,128.88C97.58,128.52 98.76,129.12 99.12,130.21C99.48,131.31 98.88,132.48 97.79,132.84L95.02,133.75L96.75,136.18C97.42,137.12 97.2,138.42 96.27,139.08C95.33,139.75 94.03,139.54 93.36,138.6L91.67,136.24L89.99,138.6C89.32,139.54 88.02,139.75 87.08,139.09C86.14,138.42 85.93,137.12 86.6,136.18L88.33,133.75L85.56,132.84C84.47,132.48 83.87,131.31 84.23,130.21C84.59,129.12 85.76,128.52 86.86,128.88L89.59,129.78V126.86C89.59,125.71 90.52,124.78 91.67,124.78ZM110.43,124.78C111.57,124.78 112.51,125.71 112.51,126.86V129.78L115.24,128.88C116.33,128.52 117.51,129.12 117.87,130.21C118.23,131.31 117.63,132.48 116.54,132.84L113.77,133.75L115.5,136.18C116.17,137.12 115.96,138.42 115.02,139.08C114.08,139.75 112.78,139.54 112.11,138.6L110.43,136.24L108.74,138.6C108.07,139.54 106.77,139.75 105.83,139.09C104.89,138.42 104.68,137.12 105.35,136.18L107.08,133.75L104.31,132.84C103.22,132.48 102.62,131.31 102.98,130.21C103.34,129.12 104.51,128.52 105.61,128.88L108.34,129.78V126.86C108.34,125.71 109.27,124.78 110.43,124.78Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M29.17,69.42C29.17,68.27 30.1,67.33 31.25,67.33L114.58,67.33C115.73,67.33 116.67,68.27 116.67,69.42C116.67,70.57 115.73,71.5 114.58,71.5L31.25,71.5C30.1,71.5 29.17,70.57 29.17,69.42Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M170.22,61.69C171.04,62.51 171.04,63.83 170.22,64.64L157.72,77.14C156.91,77.95 155.59,77.95 154.78,77.14L148.53,70.89C147.71,70.08 147.71,68.76 148.53,67.94C149.34,67.13 150.66,67.13 151.47,67.94L156.25,72.72L167.28,61.69C168.09,60.88 169.41,60.88 170.22,61.69Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M191.67,131.92C191.67,145.72 180.47,156.92 166.67,156.92C152.86,156.92 141.67,145.72 141.67,131.92C141.67,118.11 152.86,106.92 166.67,106.92C180.47,106.92 191.67,118.11 191.67,131.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M166.67,152.75C178.17,152.75 187.5,143.42 187.5,131.92C187.5,120.41 178.17,111.08 166.67,111.08C155.16,111.08 145.83,120.41 145.83,131.92C145.83,143.42 155.16,152.75 166.67,152.75ZM166.67,156.92C180.47,156.92 191.67,145.72 191.67,131.92C191.67,118.11 180.47,106.92 166.67,106.92C152.86,106.92 141.67,118.11 141.67,131.92C141.67,145.72 152.86,156.92 166.67,156.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M178.56,124.19C179.37,125.01 179.37,126.33 178.56,127.14L163.97,141.72C163.16,142.54 161.84,142.54 161.03,141.72L154.78,135.47C153.96,134.66 153.96,133.34 154.78,132.53C155.59,131.71 156.91,131.71 157.72,132.53L162.5,137.3L175.61,124.19C176.42,123.38 177.74,123.38 178.56,124.19Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M191.67,69.42C191.67,83.22 180.47,94.42 166.67,94.42C152.86,94.42 141.67,83.22 141.67,69.42C141.67,55.61 152.86,44.42 166.67,44.42C180.47,44.42 191.67,55.61 191.67,69.42Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M166.67,90.25C178.17,90.25 187.5,80.92 187.5,69.42C187.5,57.91 178.17,48.58 166.67,48.58C155.16,48.58 145.83,57.91 145.83,69.42C145.83,80.92 155.16,90.25 166.67,90.25ZM166.67,94.42C180.47,94.42 191.67,83.22 191.67,69.42C191.67,55.61 180.47,44.42 166.67,44.42C152.86,44.42 141.67,55.61 141.67,69.42C141.67,83.22 152.86,94.42 166.67,94.42Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M178.56,61.69C179.37,62.51 179.37,63.83 178.56,64.64L163.97,79.22C163.16,80.04 161.84,80.04 161.03,79.22L154.78,72.97C153.96,72.16 153.96,70.84 154.78,70.03C155.59,69.21 156.91,69.21 157.72,70.03L162.5,74.8L175.61,61.69C176.42,60.88 177.74,60.88 178.56,61.69Z" />
 </vector>
diff --git a/app/src/main/res/drawable/img_vault_items.xml b/app/src/main/res/drawable/img_vault_items.xml
index 6614e9e2fc..fea25d6155 100644
--- a/app/src/main/res/drawable/img_vault_items.xml
+++ b/app/src/main/res/drawable/img_vault_items.xml
@@ -3,78 +3,100 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H79.17C86.07,25.67 91.67,31.26 91.67,38.17V79.83C91.67,86.74 86.07,92.33 79.17,92.33H12.5C5.6,92.33 0,86.74 0,79.83V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M79.17,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V79.83C4.17,84.44 7.9,88.17 12.5,88.17H79.17C83.77,88.17 87.5,84.44 87.5,79.83V38.17C87.5,33.56 83.77,29.83 79.17,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V79.83C0,86.74 5.6,92.33 12.5,92.33H79.17C86.07,92.33 91.67,86.74 91.67,79.83V38.17C91.67,31.26 86.07,25.67 79.17,25.67H12.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,121.5C0,114.6 5.6,109 12.5,109H79.17C86.07,109 91.67,114.6 91.67,121.5V163.17C91.67,170.07 86.07,175.67 79.17,175.67H12.5C5.6,175.67 0,170.07 0,163.17V121.5Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M79.17,113.17H12.5C7.9,113.17 4.17,116.9 4.17,121.5V163.17C4.17,167.77 7.9,171.5 12.5,171.5H79.17C83.77,171.5 87.5,167.77 87.5,163.17V121.5C87.5,116.9 83.77,113.17 79.17,113.17ZM12.5,109C5.6,109 0,114.6 0,121.5V163.17C0,170.07 5.6,175.67 12.5,175.67H79.17C86.07,175.67 91.67,170.07 91.67,163.17V121.5C91.67,114.6 86.07,109 79.17,109H12.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M108.33,38.17C108.33,31.26 113.93,25.67 120.83,25.67H187.5C194.4,25.67 200,31.26 200,38.17V79.83C200,86.74 194.4,92.33 187.5,92.33H120.83C113.93,92.33 108.33,86.74 108.33,79.83V38.17Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M187.5,29.83H120.83C116.23,29.83 112.5,33.56 112.5,38.17V79.83C112.5,84.44 116.23,88.17 120.83,88.17H187.5C192.1,88.17 195.83,84.44 195.83,79.83V38.17C195.83,33.56 192.1,29.83 187.5,29.83ZM120.83,25.67C113.93,25.67 108.33,31.26 108.33,38.17V79.83C108.33,86.74 113.93,92.33 120.83,92.33H187.5C194.4,92.33 200,86.74 200,79.83V38.17C200,31.26 194.4,25.67 187.5,25.67H120.83Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M108.33,121.5C108.33,114.6 113.93,109 120.83,109H187.5C194.4,109 200,114.6 200,121.5V163.17C200,170.07 194.4,175.67 187.5,175.67H120.83C113.93,175.67 108.33,170.07 108.33,163.17V121.5Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M187.5,113.17H120.83C116.23,113.17 112.5,116.9 112.5,121.5V163.17C112.5,167.77 116.23,171.5 120.83,171.5H187.5C192.1,171.5 195.83,167.77 195.83,163.17V121.5C195.83,116.9 192.1,113.17 187.5,113.17ZM120.83,109C113.93,109 108.33,114.6 108.33,121.5V163.17C108.33,170.07 113.93,175.67 120.83,175.67H187.5C194.4,175.67 200,170.07 200,163.17V121.5C200,114.6 194.4,109 187.5,109H120.83Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M112.5,42.33H195.83V50.67H112.5V42.33Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M120.83,73.58C120.83,72.43 121.77,71.5 122.92,71.5H135.42C136.57,71.5 137.5,72.43 137.5,73.58C137.5,74.73 136.57,75.67 135.42,75.67H122.92C121.77,75.67 120.83,74.73 120.83,73.58Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M122.92,127.75C122.92,126.6 123.85,125.67 125,125.67H183.33C184.48,125.67 185.42,126.6 185.42,127.75C185.42,128.9 184.48,129.83 183.33,129.83H125C123.85,129.83 122.92,128.9 122.92,127.75Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M122.92,142.33C122.92,141.18 123.85,140.25 125,140.25H183.33C184.48,140.25 185.42,141.18 185.42,142.33C185.42,143.48 184.48,144.42 183.33,144.42H125C123.85,144.42 122.92,143.48 122.92,142.33Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M122.92,156.92C122.92,155.77 123.85,154.83 125,154.83H152.08C153.23,154.83 154.17,155.77 154.17,156.92C154.17,158.07 153.23,159 152.08,159H125C123.85,159 122.92,158.07 122.92,156.92Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M52.08,127.75C52.08,126.6 53.02,125.67 54.17,125.67H79.17C80.32,125.67 81.25,126.6 81.25,127.75C81.25,128.9 80.32,129.83 79.17,129.83H54.17C53.02,129.83 52.08,128.9 52.08,127.75Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M52.08,136.08C52.08,134.93 53.02,134 54.17,134H64.58C65.73,134 66.67,134.93 66.67,136.08C66.67,137.23 65.73,138.17 64.58,138.17H54.17C53.02,138.17 52.08,137.23 52.08,136.08Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M143.75,73.58C143.75,72.43 144.68,71.5 145.83,71.5H164.58C165.73,71.5 166.67,72.43 166.67,73.58C166.67,74.73 165.73,75.67 164.58,75.67H145.83C144.68,75.67 143.75,74.73 143.75,73.58Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M43.75,130.88C43.75,137.2 38.62,142.33 32.29,142.33C25.96,142.33 20.83,137.2 20.83,130.88C20.83,124.55 25.96,119.42 32.29,119.42C38.62,119.42 43.75,124.55 43.75,130.88Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M32.29,138.17C36.32,138.17 39.58,134.9 39.58,130.88C39.58,126.85 36.32,123.58 32.29,123.58C28.27,123.58 25,126.85 25,130.88C25,134.9 28.27,138.17 32.29,138.17ZM32.29,142.33C38.62,142.33 43.75,137.2 43.75,130.88C43.75,124.55 38.62,119.42 32.29,119.42C25.96,119.42 20.83,124.55 20.83,130.88C20.83,137.2 25.96,142.33 32.29,142.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M54.43,154.88C55.63,157.76 56.25,160.05 56.25,163.17C56.25,164.32 55.32,165.25 54.17,165.25H10.42C9.27,165.25 8.33,164.32 8.33,163.17C8.33,160.05 8.95,157.76 10.16,154.88C11.36,152.01 13.13,149.4 15.35,147.19C17.58,144.99 20.22,143.25 23.12,142.05C26.03,140.86 29.15,140.25 32.29,140.25C35.44,140.25 38.55,140.86 41.46,142.05C44.37,143.25 47.01,144.99 49.23,147.19C51.46,149.4 53.22,152.01 54.43,154.88Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M51.95,161.08C51.75,159.61 51.31,158.24 50.58,156.49C49.59,154.13 48.14,151.97 46.3,150.15C44.47,148.34 42.28,146.9 39.88,145.91C37.48,144.92 34.9,144.42 32.29,144.42C29.69,144.42 27.11,144.92 24.7,145.91C22.3,146.9 20.12,148.34 18.28,150.15C16.45,151.97 14.99,154.13 14,156.49C13.27,158.24 12.83,159.61 12.63,161.08H51.95ZM56.25,163.17C56.25,160.05 55.63,157.76 54.43,154.88C53.22,152.01 51.46,149.4 49.23,147.19C47.01,144.99 44.37,143.25 41.46,142.05C38.55,140.86 35.44,140.25 32.29,140.25C29.15,140.25 26.03,140.86 23.12,142.05C20.22,143.25 17.58,144.99 15.35,147.19C13.13,149.4 11.36,152.01 10.16,154.88C8.95,157.76 8.33,160.05 8.33,163.17C8.33,164.32 9.27,165.25 10.42,165.25H54.17C55.32,165.25 56.25,164.32 56.25,163.17Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M29.17,79.83C36.88,79.83 43.61,75.64 47.21,69.42H50.36C51.46,69.42 52.52,68.98 53.3,68.2L56.25,65.25L60.16,68.38C60.92,68.98 62,68.98 62.76,68.38L66.67,65.25L69.61,68.2C70.39,68.98 71.45,69.42 72.56,69.42H75.08C76.35,69.42 77.54,68.84 78.33,67.85L84.38,60.3C84.98,59.54 84.98,58.46 84.38,57.7L78.33,50.15C77.54,49.16 76.35,48.58 75.08,48.58H47.21C43.61,42.36 36.88,38.17 29.17,38.17C17.66,38.17 8.33,47.49 8.33,59C8.33,70.51 17.66,79.83 29.17,79.83ZM25,63.17C27.3,63.17 29.17,61.3 29.17,59C29.17,56.7 27.3,54.83 25,54.83C22.7,54.83 20.83,56.7 20.83,59C20.83,61.3 22.7,63.17 25,63.17Z"
-      android:fillColor="#FFBF00"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M44.81,65.25H50.36L55.94,59.67L61.46,64.08L66.98,59.67L72.56,65.25L75.08,65.25L80.08,59L75.08,52.75L44.81,52.75L43.61,50.67C40.72,45.68 35.33,42.33 29.17,42.33C19.96,42.33 12.5,49.8 12.5,59C12.5,68.2 19.96,75.67 29.17,75.67C35.33,75.67 40.72,72.32 43.61,67.33L44.81,65.25ZM81.12,57.7L81.12,57.7L81.12,57.7ZM33.33,59C33.33,63.6 29.6,67.33 25,67.33C20.4,67.33 16.67,63.6 16.67,59C16.67,54.4 20.4,50.67 25,50.67C29.6,50.67 33.33,54.4 33.33,59ZM47.21,69.42C43.61,75.64 36.88,79.83 29.17,79.83C17.66,79.83 8.33,70.51 8.33,59C8.33,47.49 17.66,38.17 29.17,38.17C36.88,38.17 43.61,42.36 47.21,48.58H75.08C76.35,48.58 77.54,49.16 78.33,50.15L84.38,57.7C84.98,58.46 84.98,59.54 84.38,60.3L78.33,67.85C77.54,68.84 76.35,69.42 75.08,69.42H72.56C71.45,69.42 70.39,68.98 69.61,68.2L66.67,65.25L62.76,68.38C62,68.98 60.92,68.98 60.16,68.38L56.25,65.25L53.3,68.2C52.52,68.98 51.46,69.42 50.36,69.42H47.21ZM29.17,59C29.17,61.3 27.3,63.17 25,63.17C22.7,63.17 20.83,61.3 20.83,59C20.83,56.7 22.7,54.83 25,54.83C27.3,54.83 29.17,56.7 29.17,59Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M0,38.17C0,31.26 5.6,25.67 12.5,25.67H79.17C86.07,25.67 91.67,31.26 91.67,38.17V79.83C91.67,86.74 86.07,92.33 79.17,92.33H12.5C5.6,92.33 0,86.74 0,79.83V38.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M79.17,29.83H12.5C7.9,29.83 4.17,33.56 4.17,38.17V79.83C4.17,84.44 7.9,88.17 12.5,88.17H79.17C83.77,88.17 87.5,84.44 87.5,79.83V38.17C87.5,33.56 83.77,29.83 79.17,29.83ZM12.5,25.67C5.6,25.67 0,31.26 0,38.17V79.83C0,86.74 5.6,92.33 12.5,92.33H79.17C86.07,92.33 91.67,86.74 91.67,79.83V38.17C91.67,31.26 86.07,25.67 79.17,25.67H12.5Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M0,121.5C0,114.6 5.6,109 12.5,109H79.17C86.07,109 91.67,114.6 91.67,121.5V163.17C91.67,170.07 86.07,175.67 79.17,175.67H12.5C5.6,175.67 0,170.07 0,163.17V121.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M79.17,113.17H12.5C7.9,113.17 4.17,116.9 4.17,121.5V163.17C4.17,167.77 7.9,171.5 12.5,171.5H79.17C83.77,171.5 87.5,167.77 87.5,163.17V121.5C87.5,116.9 83.77,113.17 79.17,113.17ZM12.5,109C5.6,109 0,114.6 0,121.5V163.17C0,170.07 5.6,175.67 12.5,175.67H79.17C86.07,175.67 91.67,170.07 91.67,163.17V121.5C91.67,114.6 86.07,109 79.17,109H12.5Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M108.33,38.17C108.33,31.26 113.93,25.67 120.83,25.67H187.5C194.4,25.67 200,31.26 200,38.17V79.83C200,86.74 194.4,92.33 187.5,92.33H120.83C113.93,92.33 108.33,86.74 108.33,79.83V38.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M187.5,29.83H120.83C116.23,29.83 112.5,33.56 112.5,38.17V79.83C112.5,84.44 116.23,88.17 120.83,88.17H187.5C192.1,88.17 195.83,84.44 195.83,79.83V38.17C195.83,33.56 192.1,29.83 187.5,29.83ZM120.83,25.67C113.93,25.67 108.33,31.26 108.33,38.17V79.83C108.33,86.74 113.93,92.33 120.83,92.33H187.5C194.4,92.33 200,86.74 200,79.83V38.17C200,31.26 194.4,25.67 187.5,25.67H120.83Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M108.33,121.5C108.33,114.6 113.93,109 120.83,109H187.5C194.4,109 200,114.6 200,121.5V163.17C200,170.07 194.4,175.67 187.5,175.67H120.83C113.93,175.67 108.33,170.07 108.33,163.17V121.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M187.5,113.17H120.83C116.23,113.17 112.5,116.9 112.5,121.5V163.17C112.5,167.77 116.23,171.5 120.83,171.5H187.5C192.1,171.5 195.83,167.77 195.83,163.17V121.5C195.83,116.9 192.1,113.17 187.5,113.17ZM120.83,109C113.93,109 108.33,114.6 108.33,121.5V163.17C108.33,170.07 113.93,175.67 120.83,175.67H187.5C194.4,175.67 200,170.07 200,163.17V121.5C200,114.6 194.4,109 187.5,109H120.83Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M112.5,42.33H195.83V50.67H112.5V42.33Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M120.83,73.58C120.83,72.43 121.77,71.5 122.92,71.5H135.42C136.57,71.5 137.5,72.43 137.5,73.58C137.5,74.73 136.57,75.67 135.42,75.67H122.92C121.77,75.67 120.83,74.73 120.83,73.58Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M122.92,127.75C122.92,126.6 123.85,125.67 125,125.67H183.33C184.48,125.67 185.42,126.6 185.42,127.75C185.42,128.9 184.48,129.83 183.33,129.83H125C123.85,129.83 122.92,128.9 122.92,127.75Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M122.92,142.33C122.92,141.18 123.85,140.25 125,140.25H183.33C184.48,140.25 185.42,141.18 185.42,142.33C185.42,143.48 184.48,144.42 183.33,144.42H125C123.85,144.42 122.92,143.48 122.92,142.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M122.92,156.92C122.92,155.77 123.85,154.83 125,154.83H152.08C153.23,154.83 154.17,155.77 154.17,156.92C154.17,158.07 153.23,159 152.08,159H125C123.85,159 122.92,158.07 122.92,156.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M52.08,127.75C52.08,126.6 53.02,125.67 54.17,125.67H79.17C80.32,125.67 81.25,126.6 81.25,127.75C81.25,128.9 80.32,129.83 79.17,129.83H54.17C53.02,129.83 52.08,128.9 52.08,127.75Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M52.08,136.08C52.08,134.93 53.02,134 54.17,134H64.58C65.73,134 66.67,134.93 66.67,136.08C66.67,137.23 65.73,138.17 64.58,138.17H54.17C53.02,138.17 52.08,137.23 52.08,136.08Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M143.75,73.58C143.75,72.43 144.68,71.5 145.83,71.5H164.58C165.73,71.5 166.67,72.43 166.67,73.58C166.67,74.73 165.73,75.67 164.58,75.67H145.83C144.68,75.67 143.75,74.73 143.75,73.58Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M43.75,130.88C43.75,137.2 38.62,142.33 32.29,142.33C25.96,142.33 20.83,137.2 20.83,130.88C20.83,124.55 25.96,119.42 32.29,119.42C38.62,119.42 43.75,124.55 43.75,130.88Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M32.29,138.17C36.32,138.17 39.58,134.9 39.58,130.88C39.58,126.85 36.32,123.58 32.29,123.58C28.27,123.58 25,126.85 25,130.88C25,134.9 28.27,138.17 32.29,138.17ZM32.29,142.33C38.62,142.33 43.75,137.2 43.75,130.88C43.75,124.55 38.62,119.42 32.29,119.42C25.96,119.42 20.83,124.55 20.83,130.88C20.83,137.2 25.96,142.33 32.29,142.33Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M54.43,154.88C55.63,157.76 56.25,160.05 56.25,163.17C56.25,164.32 55.32,165.25 54.17,165.25H10.42C9.27,165.25 8.33,164.32 8.33,163.17C8.33,160.05 8.95,157.76 10.16,154.88C11.36,152.01 13.13,149.4 15.35,147.19C17.58,144.99 20.22,143.25 23.12,142.05C26.03,140.86 29.15,140.25 32.29,140.25C35.44,140.25 38.55,140.86 41.46,142.05C44.37,143.25 47.01,144.99 49.23,147.19C51.46,149.4 53.22,152.01 54.43,154.88Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M51.95,161.08C51.75,159.61 51.31,158.24 50.58,156.49C49.59,154.13 48.14,151.97 46.3,150.15C44.47,148.34 42.28,146.9 39.88,145.91C37.48,144.92 34.9,144.42 32.29,144.42C29.69,144.42 27.11,144.92 24.7,145.91C22.3,146.9 20.12,148.34 18.28,150.15C16.45,151.97 14.99,154.13 14,156.49C13.27,158.24 12.83,159.61 12.63,161.08H51.95ZM56.25,163.17C56.25,160.05 55.63,157.76 54.43,154.88C53.22,152.01 51.46,149.4 49.23,147.19C47.01,144.99 44.37,143.25 41.46,142.05C38.55,140.86 35.44,140.25 32.29,140.25C29.15,140.25 26.03,140.86 23.12,142.05C20.22,143.25 17.58,144.99 15.35,147.19C13.13,149.4 11.36,152.01 10.16,154.88C8.95,157.76 8.33,160.05 8.33,163.17C8.33,164.32 9.27,165.25 10.42,165.25H54.17C55.32,165.25 56.25,164.32 56.25,163.17Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:fillType="evenOdd"
+        android:pathData="M29.17,79.83C36.88,79.83 43.61,75.64 47.21,69.42H50.36C51.46,69.42 52.52,68.98 53.3,68.2L56.25,65.25L60.16,68.38C60.92,68.98 62,68.98 62.76,68.38L66.67,65.25L69.61,68.2C70.39,68.98 71.45,69.42 72.56,69.42H75.08C76.35,69.42 77.54,68.84 78.33,67.85L84.38,60.3C84.98,59.54 84.98,58.46 84.38,57.7L78.33,50.15C77.54,49.16 76.35,48.58 75.08,48.58H47.21C43.61,42.36 36.88,38.17 29.17,38.17C17.66,38.17 8.33,47.49 8.33,59C8.33,70.51 17.66,79.83 29.17,79.83ZM25,63.17C27.3,63.17 29.17,61.3 29.17,59C29.17,56.7 27.3,54.83 25,54.83C22.7,54.83 20.83,56.7 20.83,59C20.83,61.3 22.7,63.17 25,63.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M44.81,65.25H50.36L55.94,59.67L61.46,64.08L66.98,59.67L72.56,65.25L75.08,65.25L80.08,59L75.08,52.75L44.81,52.75L43.61,50.67C40.72,45.68 35.33,42.33 29.17,42.33C19.96,42.33 12.5,49.8 12.5,59C12.5,68.2 19.96,75.67 29.17,75.67C35.33,75.67 40.72,72.32 43.61,67.33L44.81,65.25ZM81.12,57.7L81.12,57.7L81.12,57.7ZM33.33,59C33.33,63.6 29.6,67.33 25,67.33C20.4,67.33 16.67,63.6 16.67,59C16.67,54.4 20.4,50.67 25,50.67C29.6,50.67 33.33,54.4 33.33,59ZM47.21,69.42C43.61,75.64 36.88,79.83 29.17,79.83C17.66,79.83 8.33,70.51 8.33,59C8.33,47.49 17.66,38.17 29.17,38.17C36.88,38.17 43.61,42.36 47.21,48.58H75.08C76.35,48.58 77.54,49.16 78.33,50.15L84.38,57.7C84.98,58.46 84.98,59.54 84.38,60.3L78.33,67.85C77.54,68.84 76.35,69.42 75.08,69.42H72.56C71.45,69.42 70.39,68.98 69.61,68.2L66.67,65.25L62.76,68.38C62,68.98 60.92,68.98 60.16,68.38L56.25,65.25L53.3,68.2C52.52,68.98 51.46,69.42 50.36,69.42H47.21ZM29.17,59C29.17,61.3 27.3,63.17 25,63.17C22.7,63.17 20.83,61.3 20.83,59C20.83,56.7 22.7,54.83 25,54.83C27.3,54.83 29.17,56.7 29.17,59Z" />
 </vector>
diff --git a/app/src/main/res/drawable/lock.xml b/app/src/main/res/drawable/lock.xml
index 4f050beb63..276f8e2e81 100644
--- a/app/src/main/res/drawable/lock.xml
+++ b/app/src/main/res/drawable/lock.xml
@@ -3,38 +3,48 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M29.17,79.83C29.17,66.03 38.68,54.83 50.42,54.83H149.58C161.32,54.83 170.83,66.03 170.83,79.83V159C170.83,172.81 161.32,184 149.58,184H50.42C38.68,184 29.17,172.81 29.17,159V79.83Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M149.58,59H50.42C40.64,59 32.71,68.33 32.71,79.83V159C32.71,170.51 40.64,179.83 50.42,179.83H149.58C159.36,179.83 167.29,170.51 167.29,159V79.83C167.29,68.33 159.36,59 149.58,59ZM50.42,54.83C38.68,54.83 29.17,66.03 29.17,79.83V159C29.17,172.81 38.68,184 50.42,184H149.58C161.32,184 170.83,172.81 170.83,159V79.83C170.83,66.03 161.32,54.83 149.58,54.83H50.42Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M139.58,56.92V42.33C139.58,20.47 121.86,2.75 100,2.75C78.14,2.75 60.42,20.47 60.42,42.33V56.92L72.92,56.92V42.33C72.92,27.38 85.04,15.25 100,15.25C114.96,15.25 127.08,27.38 127.08,42.33V56.92L139.58,56.92Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M58.33,42.33C58.33,19.32 76.99,0.67 100,0.67C123.01,0.67 141.67,19.32 141.67,42.33V59L125,59V42.33C125,28.53 113.81,17.33 100,17.33C86.19,17.33 75,28.53 75,42.33V59L58.33,59V42.33ZM100,4.83C79.29,4.83 62.5,21.62 62.5,42.33V54.83L70.83,54.83V42.33C70.83,26.22 83.89,13.17 100,13.17C116.11,13.17 129.17,26.22 129.17,42.33V54.83L137.5,54.83V42.33C137.5,21.62 120.71,4.83 100,4.83Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M33.33,140.25H166.67V156.92H33.33V140.25Z"
-      android:fillColor="#99BAF4"/>
-  <path
-      android:pathData="M62.5,46.5H70.83V54.83H62.5V46.5Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M129.17,46.5H137.5V54.83H129.17V46.5Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M0,119.42C0,105.61 11.19,94.42 25,94.42H175C188.81,94.42 200,105.61 200,119.42C200,133.22 188.81,144.42 175,144.42H25C11.19,144.42 0,133.22 0,119.42Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M175,98.58H25C13.49,98.58 4.17,107.91 4.17,119.42C4.17,130.92 13.49,140.25 25,140.25H175C186.51,140.25 195.83,130.92 195.83,119.42C195.83,107.91 186.51,98.58 175,98.58ZM25,94.42C11.19,94.42 0,105.61 0,119.42C0,133.22 11.19,144.42 25,144.42H175C188.81,144.42 200,133.22 200,119.42C200,105.61 188.81,94.42 175,94.42H25Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M41.67,106.92C42.82,106.92 43.75,107.89 43.75,109.09V117.79L51.54,113.64C52.6,113.08 53.9,113.45 54.44,114.46C54.98,115.48 54.56,116.76 53.5,117.32L45.09,121.79L51.81,129.01C52.63,129.88 52.61,131.23 51.77,132.01C50.93,132.8 49.58,132.72 48.76,131.85L41.67,124.24L34.57,131.85C33.75,132.72 32.41,132.8 31.56,132.01C30.72,131.23 30.7,129.88 31.52,129.01L38.25,121.79L29.83,117.32C28.78,116.76 28.36,115.48 28.9,114.46C29.44,113.45 30.73,113.08 31.79,113.64L39.58,117.79V109.09C39.58,107.89 40.52,106.92 41.67,106.92ZM75,106.92C76.15,106.92 77.08,107.89 77.08,109.09V117.79L84.88,113.64C85.93,113.08 87.23,113.45 87.77,114.46C88.31,115.48 87.89,116.76 86.83,117.32L78.42,121.79L85.15,129.01C85.96,129.88 85.94,131.23 85.1,132.01C84.26,132.8 82.92,132.72 82.1,131.85L75,124.24L67.9,131.85C67.08,132.72 65.74,132.8 64.9,132.01C64.06,131.23 64.04,129.88 64.85,129.01L71.58,121.79L63.17,117.32C62.11,116.76 61.69,115.48 62.23,114.46C62.77,113.45 64.07,113.08 65.12,113.64L72.92,117.79V109.09C72.92,107.89 73.85,106.92 75,106.92ZM110.42,109.09C110.42,107.89 109.48,106.92 108.33,106.92C107.18,106.92 106.25,107.89 106.25,109.09V117.79L98.46,113.64C97.4,113.08 96.1,113.45 95.56,114.46C95.02,115.48 95.44,116.76 96.5,117.32L104.91,121.79L98.19,129.01C97.37,129.88 97.39,131.23 98.23,132.01C99.07,132.8 100.42,132.72 101.23,131.85L108.33,124.24L115.43,131.85C116.25,132.72 117.59,132.8 118.44,132.01C119.28,131.23 119.3,129.88 118.48,129.01L111.75,121.79L120.17,117.32C121.22,116.76 121.64,115.48 121.1,114.46C120.56,113.45 119.27,113.08 118.21,113.64L110.42,117.79V109.09ZM127.08,129.83C127.08,128.68 128.02,127.75 129.17,127.75H145.83C146.98,127.75 147.92,128.68 147.92,129.83C147.92,130.98 146.98,131.92 145.83,131.92H129.17C128.02,131.92 127.08,130.98 127.08,129.83ZM154.17,127.75C153.02,127.75 152.08,128.68 152.08,129.83C152.08,130.98 153.02,131.92 154.17,131.92H170.83C171.98,131.92 172.92,130.98 172.92,129.83C172.92,128.68 171.98,127.75 170.83,127.75H154.17Z"
-      android:fillColor="#0E3781"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M29.17,79.83C29.17,66.03 38.68,54.83 50.42,54.83H149.58C161.32,54.83 170.83,66.03 170.83,79.83V159C170.83,172.81 161.32,184 149.58,184H50.42C38.68,184 29.17,172.81 29.17,159V79.83Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M149.58,59H50.42C40.64,59 32.71,68.33 32.71,79.83V159C32.71,170.51 40.64,179.83 50.42,179.83H149.58C159.36,179.83 167.29,170.51 167.29,159V79.83C167.29,68.33 159.36,59 149.58,59ZM50.42,54.83C38.68,54.83 29.17,66.03 29.17,79.83V159C29.17,172.81 38.68,184 50.42,184H149.58C161.32,184 170.83,172.81 170.83,159V79.83C170.83,66.03 161.32,54.83 149.58,54.83H50.42Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M139.58,56.92V42.33C139.58,20.47 121.86,2.75 100,2.75C78.14,2.75 60.42,20.47 60.42,42.33V56.92L72.92,56.92V42.33C72.92,27.38 85.04,15.25 100,15.25C114.96,15.25 127.08,27.38 127.08,42.33V56.92L139.58,56.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M58.33,42.33C58.33,19.32 76.99,0.67 100,0.67C123.01,0.67 141.67,19.32 141.67,42.33V59L125,59V42.33C125,28.53 113.81,17.33 100,17.33C86.19,17.33 75,28.53 75,42.33V59L58.33,59V42.33ZM100,4.83C79.29,4.83 62.5,21.62 62.5,42.33V54.83L70.83,54.83V42.33C70.83,26.22 83.89,13.17 100,13.17C116.11,13.17 129.17,26.22 129.17,42.33V54.83L137.5,54.83V42.33C137.5,21.62 120.71,4.83 100,4.83Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M33.33,140.25H166.67V156.92H33.33V140.25Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M62.5,46.5H70.83V54.83H62.5V46.5Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M129.17,46.5H137.5V54.83H129.17V46.5Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M0,119.42C0,105.61 11.19,94.42 25,94.42H175C188.81,94.42 200,105.61 200,119.42C200,133.22 188.81,144.42 175,144.42H25C11.19,144.42 0,133.22 0,119.42Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M175,98.58H25C13.49,98.58 4.17,107.91 4.17,119.42C4.17,130.92 13.49,140.25 25,140.25H175C186.51,140.25 195.83,130.92 195.83,119.42C195.83,107.91 186.51,98.58 175,98.58ZM25,94.42C11.19,94.42 0,105.61 0,119.42C0,133.22 11.19,144.42 25,144.42H175C188.81,144.42 200,133.22 200,119.42C200,105.61 188.81,94.42 175,94.42H25Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M41.67,106.92C42.82,106.92 43.75,107.89 43.75,109.09V117.79L51.54,113.64C52.6,113.08 53.9,113.45 54.44,114.46C54.98,115.48 54.56,116.76 53.5,117.32L45.09,121.79L51.81,129.01C52.63,129.88 52.61,131.23 51.77,132.01C50.93,132.8 49.58,132.72 48.76,131.85L41.67,124.24L34.57,131.85C33.75,132.72 32.41,132.8 31.56,132.01C30.72,131.23 30.7,129.88 31.52,129.01L38.25,121.79L29.83,117.32C28.78,116.76 28.36,115.48 28.9,114.46C29.44,113.45 30.73,113.08 31.79,113.64L39.58,117.79V109.09C39.58,107.89 40.52,106.92 41.67,106.92ZM75,106.92C76.15,106.92 77.08,107.89 77.08,109.09V117.79L84.88,113.64C85.93,113.08 87.23,113.45 87.77,114.46C88.31,115.48 87.89,116.76 86.83,117.32L78.42,121.79L85.15,129.01C85.96,129.88 85.94,131.23 85.1,132.01C84.26,132.8 82.92,132.72 82.1,131.85L75,124.24L67.9,131.85C67.08,132.72 65.74,132.8 64.9,132.01C64.06,131.23 64.04,129.88 64.85,129.01L71.58,121.79L63.17,117.32C62.11,116.76 61.69,115.48 62.23,114.46C62.77,113.45 64.07,113.08 65.12,113.64L72.92,117.79V109.09C72.92,107.89 73.85,106.92 75,106.92ZM110.42,109.09C110.42,107.89 109.48,106.92 108.33,106.92C107.18,106.92 106.25,107.89 106.25,109.09V117.79L98.46,113.64C97.4,113.08 96.1,113.45 95.56,114.46C95.02,115.48 95.44,116.76 96.5,117.32L104.91,121.79L98.19,129.01C97.37,129.88 97.39,131.23 98.23,132.01C99.07,132.8 100.42,132.72 101.23,131.85L108.33,124.24L115.43,131.85C116.25,132.72 117.59,132.8 118.44,132.01C119.28,131.23 119.3,129.88 118.48,129.01L111.75,121.79L120.17,117.32C121.22,116.76 121.64,115.48 121.1,114.46C120.56,113.45 119.27,113.08 118.21,113.64L110.42,117.79V109.09ZM127.08,129.83C127.08,128.68 128.02,127.75 129.17,127.75H145.83C146.98,127.75 147.92,128.68 147.92,129.83C147.92,130.98 146.98,131.92 145.83,131.92H129.17C128.02,131.92 127.08,130.98 127.08,129.83ZM154.17,127.75C153.02,127.75 152.08,128.68 152.08,129.83C152.08,130.98 153.02,131.92 154.17,131.92H170.83C171.98,131.92 172.92,130.98 172.92,129.83C172.92,128.68 171.98,127.75 170.83,127.75H154.17Z" />
 </vector>
diff --git a/app/src/main/res/drawable/open_email.xml b/app/src/main/res/drawable/open_email.xml
index 2f9cee1a4e..38d2f4c260 100644
--- a/app/src/main/res/drawable/open_email.xml
+++ b/app/src/main/res/drawable/open_email.xml
@@ -3,46 +3,58 @@
     android:height="193dp"
     android:viewportWidth="192"
     android:viewportHeight="193">
-  <path
-      android:pathData="M8,78.18C8,74.68 9.53,71.35 12.19,69.08L89.49,2.75C93.23,-0.46 98.77,-0.46 102.51,2.75L179.81,69.08C182.47,71.35 184,74.68 184,78.18V176.67C184,181.09 180.42,184.67 176,184.67H16C11.58,184.67 8,181.09 8,176.67V78.18Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M180,176.67V78.18C180,75.85 178.98,73.63 177.21,72.11L99.91,5.79C97.66,3.86 94.34,3.86 92.09,5.79L14.79,72.11C13.02,73.63 12,75.85 12,78.18V176.67C12,178.88 13.79,180.67 16,180.67H176C178.21,180.67 180,178.88 180,176.67ZM12.19,69.08C9.53,71.35 8,74.68 8,78.18V176.67C8,181.09 11.58,184.67 16,184.67H176C180.42,184.67 184,181.09 184,176.67V78.18C184,74.68 182.47,71.35 179.81,69.08L102.51,2.75C98.77,-0.46 93.23,-0.46 89.49,2.75L12.19,69.08Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M100.75,130.67C97.93,132.76 94.07,132.76 91.25,130.67L13.19,73.06C12.3,72.4 11.05,72.59 10.39,73.48C9.74,74.37 9.92,75.62 10.81,76.28L88.87,133.89C93.11,137.02 98.89,137.02 103.13,133.89L181.19,76.28C182.08,75.62 182.26,74.37 181.61,73.48C180.95,72.59 179.7,72.4 178.81,73.06L100.75,130.67Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M30,22.67H162V90.67L98.4,137.89C96.97,138.94 95.03,138.94 93.61,137.88L30,90.17V22.67Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M158,26.67H34V88.17L96.01,134.68L158,88.65V26.67ZM162,90.67L98.4,137.89C96.97,138.94 95.03,138.94 93.61,137.88L30,90.17V22.67H162V90.67Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M96,118.67L140,143.67L96,168.67L52,143.67L96,118.67Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M100.85,122.88C97.98,120.69 94.02,120.69 91.15,122.88L13.21,182.26C12.33,182.93 11.08,182.76 10.41,181.88C9.74,181 9.91,179.74 10.79,179.08L88.73,119.69C93.02,116.42 98.98,116.42 103.27,119.69L102.09,121.25L103.27,119.69L181.21,179.08C182.09,179.74 182.26,181 181.59,181.88C180.92,182.76 179.67,182.93 178.79,182.26L100.85,122.88Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M168,96.67C168,118.76 150.09,136.67 128,136.67C105.91,136.67 88,118.76 88,96.67C88,74.58 105.91,56.67 128,56.67C150.09,56.67 168,74.58 168,96.67Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M128,132.67C147.88,132.67 164,116.55 164,96.67C164,76.78 147.88,60.67 128,60.67C108.12,60.67 92,76.78 92,96.67C92,116.55 108.12,132.67 128,132.67ZM128,136.67C150.09,136.67 168,118.76 168,96.67C168,74.58 150.09,56.67 128,56.67C105.91,56.67 88,74.58 88,96.67C88,118.76 105.91,136.67 128,136.67Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M158,96.67C158,113.24 144.57,126.67 128,126.67C111.43,126.67 98,113.24 98,96.67C98,80.1 111.43,66.67 128,66.67C144.57,66.67 158,80.1 158,96.67Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M190.01,154.84L157,123.67L153,127.67L184.17,160.67C185.72,162.31 188.32,162.35 189.91,160.76L190.09,160.58C191.68,158.98 191.65,156.39 190.01,154.84Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M44,40.67C42.9,40.67 42,41.56 42,42.67C42,43.77 42.9,44.67 44,44.67H64C65.1,44.67 66,43.77 66,42.67C66,41.56 65.1,40.67 64,40.67H44ZM132,48.67C133.1,48.67 134,49.56 134,50.67C134,51.77 133.1,52.67 132,52.67H112C110.89,52.67 110,51.77 110,50.67C110,49.56 110.89,48.67 112,48.67H132ZM133.09,56.99C132.77,56.78 132.4,56.67 132,56.67H128H112C110.89,56.67 110,57.56 110,58.67C110,59.43 110.42,60.09 111.05,60.43C116.19,58.01 121.94,56.67 128,56.67C129.72,56.67 131.42,56.78 133.09,56.99ZM90.52,82.67C90.03,83.97 89.61,85.3 89.26,86.67H84C82.9,86.67 82,85.77 82,84.67C82,83.56 82.9,82.67 84,82.67H90.52ZM94.59,74.67C93.74,75.95 92.97,77.29 92.27,78.67L78,78.67C76.9,78.67 76,77.77 76,76.67C76,75.56 76.9,74.67 78,74.67L94.59,74.67ZM72,40.67C70.9,40.67 70,41.56 70,42.67C70,43.77 70.9,44.67 72,44.67H92C93.1,44.67 94,43.77 94,42.67C94,41.56 93.1,40.67 92,40.67H72ZM106,50.67C106,49.56 105.11,48.67 104,48.67H84C82.9,48.67 82,49.56 82,50.67C82,51.77 82.9,52.67 84,52.67H104C105.11,52.67 106,51.77 106,50.67ZM104,60.67C105.11,60.67 106,59.77 106,58.67C106,57.56 105.11,56.67 104,56.67L80,56.67C78.9,56.67 78,57.56 78,58.67C78,59.77 78.9,60.67 80,60.67L104,60.67ZM100,40.67C98.9,40.67 98,41.56 98,42.67C98,43.77 98.9,44.67 100,44.67H104C105.11,44.67 106,43.77 106,42.67C106,41.56 105.11,40.67 104,40.67H100ZM78,50.67C78,49.56 77.1,48.67 76,48.67H72C70.9,48.67 70,49.56 70,50.67C70,51.77 70.9,52.67 72,52.67H76C77.1,52.67 78,51.77 78,50.67ZM72,60.67C73.1,60.67 74,59.77 74,58.67C74,57.56 73.1,56.67 72,56.67H64C62.9,56.67 62,57.56 62,58.67C62,59.77 62.9,60.67 64,60.67H72ZM72,76.67C72,77.77 71.1,78.67 70,78.67H58C56.9,78.67 56,77.77 56,76.67C56,75.56 56.9,74.67 58,74.67H70C71.1,74.67 72,75.56 72,76.67ZM76,86.67C77.1,86.67 78,85.77 78,84.67C78,83.56 77.1,82.67 76,82.67H44C42.9,82.67 42,83.56 42,84.67C42,85.77 42.9,86.67 44,86.67H76ZM112,40.67C110.89,40.67 110,41.56 110,42.67C110,43.77 110.89,44.67 112,44.67L132,44.67C133.1,44.67 134,43.77 134,42.67C134,41.56 133.1,40.67 132,40.67H112ZM66,50.67C66,49.56 65.1,48.67 64,48.67L44,48.67C42.9,48.67 42,49.56 42,50.67C42,51.77 42.9,52.67 44,52.67L64,52.67C65.1,52.67 66,51.77 66,50.67ZM56,60.67C57.1,60.67 58,59.77 58,58.67C58,57.56 57.1,56.67 56,56.67H44C42.9,56.67 42,57.56 42,58.67C42,59.77 42.9,60.67 44,60.67H56ZM52,76.67C52,77.77 51.1,78.67 50,78.67H44C42.9,78.67 42,77.77 42,76.67C42,75.56 42.9,74.67 44,74.67H50C51.1,74.67 52,75.56 52,76.67Z"
-      android:fillColor="#FFBF00"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M8,78.18C8,74.68 9.53,71.35 12.19,69.08L89.49,2.75C93.23,-0.46 98.77,-0.46 102.51,2.75L179.81,69.08C182.47,71.35 184,74.68 184,78.18V176.67C184,181.09 180.42,184.67 176,184.67H16C11.58,184.67 8,181.09 8,176.67V78.18Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M180,176.67V78.18C180,75.85 178.98,73.63 177.21,72.11L99.91,5.79C97.66,3.86 94.34,3.86 92.09,5.79L14.79,72.11C13.02,73.63 12,75.85 12,78.18V176.67C12,178.88 13.79,180.67 16,180.67H176C178.21,180.67 180,178.88 180,176.67ZM12.19,69.08C9.53,71.35 8,74.68 8,78.18V176.67C8,181.09 11.58,184.67 16,184.67H176C180.42,184.67 184,181.09 184,176.67V78.18C184,74.68 182.47,71.35 179.81,69.08L102.51,2.75C98.77,-0.46 93.23,-0.46 89.49,2.75L12.19,69.08Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M100.75,130.67C97.93,132.76 94.07,132.76 91.25,130.67L13.19,73.06C12.3,72.4 11.05,72.59 10.39,73.48C9.74,74.37 9.92,75.62 10.81,76.28L88.87,133.89C93.11,137.02 98.89,137.02 103.13,133.89L181.19,76.28C182.08,75.62 182.26,74.37 181.61,73.48C180.95,72.59 179.7,72.4 178.81,73.06L100.75,130.67Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M30,22.67H162V90.67L98.4,137.89C96.97,138.94 95.03,138.94 93.61,137.88L30,90.17V22.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M158,26.67H34V88.17L96.01,134.68L158,88.65V26.67ZM162,90.67L98.4,137.89C96.97,138.94 95.03,138.94 93.61,137.88L30,90.17V22.67H162V90.67Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M96,118.67L140,143.67L96,168.67L52,143.67L96,118.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M100.85,122.88C97.98,120.69 94.02,120.69 91.15,122.88L13.21,182.26C12.33,182.93 11.08,182.76 10.41,181.88C9.74,181 9.91,179.74 10.79,179.08L88.73,119.69C93.02,116.42 98.98,116.42 103.27,119.69L102.09,121.25L103.27,119.69L181.21,179.08C182.09,179.74 182.26,181 181.59,181.88C180.92,182.76 179.67,182.93 178.79,182.26L100.85,122.88Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M168,96.67C168,118.76 150.09,136.67 128,136.67C105.91,136.67 88,118.76 88,96.67C88,74.58 105.91,56.67 128,56.67C150.09,56.67 168,74.58 168,96.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M128,132.67C147.88,132.67 164,116.55 164,96.67C164,76.78 147.88,60.67 128,60.67C108.12,60.67 92,76.78 92,96.67C92,116.55 108.12,132.67 128,132.67ZM128,136.67C150.09,136.67 168,118.76 168,96.67C168,74.58 150.09,56.67 128,56.67C105.91,56.67 88,74.58 88,96.67C88,118.76 105.91,136.67 128,136.67Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M158,96.67C158,113.24 144.57,126.67 128,126.67C111.43,126.67 98,113.24 98,96.67C98,80.1 111.43,66.67 128,66.67C144.57,66.67 158,80.1 158,96.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M190.01,154.84L157,123.67L153,127.67L184.17,160.67C185.72,162.31 188.32,162.35 189.91,160.76L190.09,160.58C191.68,158.98 191.65,156.39 190.01,154.84Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:fillType="evenOdd"
+        android:pathData="M44,40.67C42.9,40.67 42,41.56 42,42.67C42,43.77 42.9,44.67 44,44.67H64C65.1,44.67 66,43.77 66,42.67C66,41.56 65.1,40.67 64,40.67H44ZM132,48.67C133.1,48.67 134,49.56 134,50.67C134,51.77 133.1,52.67 132,52.67H112C110.89,52.67 110,51.77 110,50.67C110,49.56 110.89,48.67 112,48.67H132ZM133.09,56.99C132.77,56.78 132.4,56.67 132,56.67H128H112C110.89,56.67 110,57.56 110,58.67C110,59.43 110.42,60.09 111.05,60.43C116.19,58.01 121.94,56.67 128,56.67C129.72,56.67 131.42,56.78 133.09,56.99ZM90.52,82.67C90.03,83.97 89.61,85.3 89.26,86.67H84C82.9,86.67 82,85.77 82,84.67C82,83.56 82.9,82.67 84,82.67H90.52ZM94.59,74.67C93.74,75.95 92.97,77.29 92.27,78.67L78,78.67C76.9,78.67 76,77.77 76,76.67C76,75.56 76.9,74.67 78,74.67L94.59,74.67ZM72,40.67C70.9,40.67 70,41.56 70,42.67C70,43.77 70.9,44.67 72,44.67H92C93.1,44.67 94,43.77 94,42.67C94,41.56 93.1,40.67 92,40.67H72ZM106,50.67C106,49.56 105.11,48.67 104,48.67H84C82.9,48.67 82,49.56 82,50.67C82,51.77 82.9,52.67 84,52.67H104C105.11,52.67 106,51.77 106,50.67ZM104,60.67C105.11,60.67 106,59.77 106,58.67C106,57.56 105.11,56.67 104,56.67L80,56.67C78.9,56.67 78,57.56 78,58.67C78,59.77 78.9,60.67 80,60.67L104,60.67ZM100,40.67C98.9,40.67 98,41.56 98,42.67C98,43.77 98.9,44.67 100,44.67H104C105.11,44.67 106,43.77 106,42.67C106,41.56 105.11,40.67 104,40.67H100ZM78,50.67C78,49.56 77.1,48.67 76,48.67H72C70.9,48.67 70,49.56 70,50.67C70,51.77 70.9,52.67 72,52.67H76C77.1,52.67 78,51.77 78,50.67ZM72,60.67C73.1,60.67 74,59.77 74,58.67C74,57.56 73.1,56.67 72,56.67H64C62.9,56.67 62,57.56 62,58.67C62,59.77 62.9,60.67 64,60.67H72ZM72,76.67C72,77.77 71.1,78.67 70,78.67H58C56.9,78.67 56,77.77 56,76.67C56,75.56 56.9,74.67 58,74.67H70C71.1,74.67 72,75.56 72,76.67ZM76,86.67C77.1,86.67 78,85.77 78,84.67C78,83.56 77.1,82.67 76,82.67H44C42.9,82.67 42,83.56 42,84.67C42,85.77 42.9,86.67 44,86.67H76ZM112,40.67C110.89,40.67 110,41.56 110,42.67C110,43.77 110.89,44.67 112,44.67L132,44.67C133.1,44.67 134,43.77 134,42.67C134,41.56 133.1,40.67 132,40.67H112ZM66,50.67C66,49.56 65.1,48.67 64,48.67L44,48.67C42.9,48.67 42,49.56 42,50.67C42,51.77 42.9,52.67 44,52.67L64,52.67C65.1,52.67 66,51.77 66,50.67ZM56,60.67C57.1,60.67 58,59.77 58,58.67C58,57.56 57.1,56.67 56,56.67H44C42.9,56.67 42,57.56 42,58.67C42,59.77 42.9,60.67 44,60.67H56ZM52,76.67C52,77.77 51.1,78.67 50,78.67H44C42.9,78.67 42,77.77 42,76.67C42,75.56 42.9,74.67 44,74.67H50C51.1,74.67 52,75.56 52,76.67Z" />
 </vector>
diff --git a/app/src/main/res/drawable/pending_requests.xml b/app/src/main/res/drawable/pending_requests.xml
index cadc96df6a..550b16a7d8 100644
--- a/app/src/main/res/drawable/pending_requests.xml
+++ b/app/src/main/res/drawable/pending_requests.xml
@@ -3,74 +3,94 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M120.83,81.92C120.83,93.42 111.5,102.75 100,102.75C88.49,102.75 79.17,93.42 79.17,81.92C79.17,70.41 88.49,61.08 100,61.08C111.5,61.08 120.83,70.41 120.83,81.92Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M100,98.58C109.2,98.58 116.67,91.12 116.67,81.92C116.67,72.71 109.2,65.25 100,65.25C90.79,65.25 83.33,72.71 83.33,81.92C83.33,91.12 90.79,98.58 100,98.58ZM100,102.75C111.5,102.75 120.83,93.42 120.83,81.92C120.83,70.41 111.5,61.08 100,61.08C88.49,61.08 79.17,70.41 79.17,81.92C79.17,93.42 88.49,102.75 100,102.75Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M37.5,134C37.5,139.75 32.84,144.42 27.08,144.42C21.33,144.42 16.67,139.75 16.67,134C16.67,128.25 21.33,123.58 27.08,123.58C32.84,123.58 37.5,128.25 37.5,134Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M27.08,140.25C30.53,140.25 33.33,137.45 33.33,134C33.33,130.55 30.53,127.75 27.08,127.75C23.63,127.75 20.83,130.55 20.83,134C20.83,137.45 23.63,140.25 27.08,140.25ZM27.08,144.42C32.84,144.42 37.5,139.75 37.5,134C37.5,128.25 32.84,123.58 27.08,123.58C21.33,123.58 16.67,128.25 16.67,134C16.67,139.75 21.33,144.42 27.08,144.42Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M179.17,117.33C179.17,126.54 171.71,134 162.5,134C153.3,134 145.83,126.54 145.83,117.33C145.83,108.13 153.3,100.67 162.5,100.67C171.71,100.67 179.17,108.13 179.17,117.33Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M162.5,129.83C169.4,129.83 175,124.24 175,117.33C175,110.43 169.4,104.83 162.5,104.83C155.6,104.83 150,110.43 150,117.33C150,124.24 155.6,129.83 162.5,129.83ZM162.5,134C171.71,134 179.17,126.54 179.17,117.33C179.17,108.13 171.71,100.67 162.5,100.67C153.3,100.67 145.83,108.13 145.83,117.33C145.83,126.54 153.3,134 162.5,134Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M120.83,81.92C120.83,93.42 111.5,102.75 100,102.75C88.49,102.75 79.17,93.42 79.17,81.92C79.17,70.41 88.49,61.08 100,61.08C111.5,61.08 120.83,70.41 120.83,81.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M100,98.58C109.2,98.58 116.67,91.12 116.67,81.92C116.67,72.71 109.2,65.25 100,65.25C90.79,65.25 83.33,72.71 83.33,81.92C83.33,91.12 90.79,98.58 100,98.58ZM100,102.75C111.5,102.75 120.83,93.42 120.83,81.92C120.83,70.41 111.5,61.08 100,61.08C88.49,61.08 79.17,70.41 79.17,81.92C79.17,93.42 88.49,102.75 100,102.75Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M37.5,134C37.5,139.75 32.84,144.42 27.08,144.42C21.33,144.42 16.67,139.75 16.67,134C16.67,128.25 21.33,123.58 27.08,123.58C32.84,123.58 37.5,128.25 37.5,134Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M27.08,140.25C30.53,140.25 33.33,137.45 33.33,134C33.33,130.55 30.53,127.75 27.08,127.75C23.63,127.75 20.83,130.55 20.83,134C20.83,137.45 23.63,140.25 27.08,140.25ZM27.08,144.42C32.84,144.42 37.5,139.75 37.5,134C37.5,128.25 32.84,123.58 27.08,123.58C21.33,123.58 16.67,128.25 16.67,134C16.67,139.75 21.33,144.42 27.08,144.42Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M179.17,117.33C179.17,126.54 171.71,134 162.5,134C153.3,134 145.83,126.54 145.83,117.33C145.83,108.13 153.3,100.67 162.5,100.67C171.71,100.67 179.17,108.13 179.17,117.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M162.5,129.83C169.4,129.83 175,124.24 175,117.33C175,110.43 169.4,104.83 162.5,104.83C155.6,104.83 150,110.43 150,117.33C150,124.24 155.6,129.83 162.5,129.83ZM162.5,134C171.71,134 179.17,126.54 179.17,117.33C179.17,108.13 171.71,100.67 162.5,100.67C153.3,100.67 145.83,108.13 145.83,117.33C145.83,126.54 153.3,134 162.5,134Z" />
 </vector>
diff --git a/app/src/main/res/drawable/vault.xml b/app/src/main/res/drawable/vault.xml
index 93f3584280..c697b3579f 100644
--- a/app/src/main/res/drawable/vault.xml
+++ b/app/src/main/res/drawable/vault.xml
@@ -3,72 +3,91 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M20.83,167.33H50L45.83,188.17H25L20.83,167.33Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M20.83,167.33L25,188.17H45.83L50,167.33H20.83ZM25.92,171.5L28.42,184H42.42L44.92,171.5H25.92Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M150,167.33H179.17L175,188.17H154.17L150,167.33Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M150,167.33L154.17,188.17H175L179.17,167.33H150ZM155.08,171.5L157.58,184H171.58L174.08,171.5H155.08Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M26.04,171.5L27.08,177.75H43.75L44.79,171.5H26.04Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M155.21,171.5L156.25,177.75H172.92L173.96,171.5H155.21Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,38.17C0,28.96 7.46,21.5 16.67,21.5H183.33C192.54,21.5 200,28.96 200,38.17V154.83C200,164.04 192.54,171.5 183.33,171.5H16.67C7.46,171.5 0,164.04 0,154.83V38.17Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M183.33,25.67H16.67C9.76,25.67 4.17,31.26 4.17,38.17V154.83C4.17,161.74 9.76,167.33 16.67,167.33H183.33C190.24,167.33 195.83,161.74 195.83,154.83V38.17C195.83,31.26 190.24,25.67 183.33,25.67ZM16.67,21.5C7.46,21.5 0,28.96 0,38.17V154.83C0,164.04 7.46,171.5 16.67,171.5H183.33C192.54,171.5 200,164.04 200,154.83V38.17C200,28.96 192.54,21.5 183.33,21.5H16.67Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M16.67,46.5C16.67,41.9 20.4,38.17 25,38.17H175C179.6,38.17 183.33,41.9 183.33,46.5V146.5C183.33,151.1 179.6,154.83 175,154.83H25C20.4,154.83 16.67,151.1 16.67,146.5V46.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M175,42.33H25C22.7,42.33 20.83,44.2 20.83,46.5V146.5C20.83,148.8 22.7,150.67 25,150.67H175C177.3,150.67 179.17,148.8 179.17,146.5V46.5C179.17,44.2 177.3,42.33 175,42.33ZM25,38.17C20.4,38.17 16.67,41.9 16.67,46.5V146.5C16.67,151.1 20.4,154.83 25,154.83H175C179.6,154.83 183.33,151.1 183.33,146.5V46.5C183.33,41.9 179.6,38.17 175,38.17H25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M112.5,96.5C112.5,118.36 94.78,136.08 72.92,136.08C51.06,136.08 33.33,118.36 33.33,96.5C33.33,74.64 51.06,56.92 72.92,56.92C94.78,56.92 112.5,74.64 112.5,96.5Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M91.67,96.5C91.67,106.86 83.27,115.25 72.92,115.25C62.56,115.25 54.17,106.86 54.17,96.5C54.17,86.14 62.56,77.75 72.92,77.75C83.27,77.75 91.67,86.14 91.67,96.5Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M75,63.17C75,62.02 74.07,61.08 72.92,61.08C71.77,61.08 70.83,62.02 70.83,63.17V73.68C66.07,74.11 61.73,75.99 58.25,78.89L50.82,71.46C50.01,70.64 48.69,70.64 47.87,71.46C47.06,72.27 47.06,73.59 47.87,74.4L55.31,81.83C52.41,85.31 50.52,89.65 50.09,94.42H39.58C38.43,94.42 37.5,95.35 37.5,96.5C37.5,97.65 38.43,98.58 39.58,98.58H50.09C50.52,103.35 52.41,107.69 55.31,111.16L47.87,118.6C47.06,119.41 47.06,120.73 47.87,121.54C48.69,122.36 50.01,122.36 50.82,121.54L58.25,114.11C61.73,117.01 66.07,118.89 70.83,119.32V129.83C70.83,130.98 71.77,131.92 72.92,131.92C74.07,131.92 75,130.98 75,129.83V119.32C79.76,118.89 84.11,117.01 87.58,114.11L95.01,121.54C95.83,122.36 97.15,122.36 97.96,121.54C98.77,120.73 98.77,119.41 97.96,118.6L90.53,111.16C93.42,107.69 95.31,103.35 95.74,98.58H106.25C107.4,98.58 108.33,97.65 108.33,96.5C108.33,95.35 107.4,94.42 106.25,94.42H95.74C95.31,89.65 93.42,85.31 90.53,81.83L97.96,74.4C98.77,73.59 98.77,72.27 97.96,71.46C97.15,70.64 95.83,70.64 95.01,71.46L87.58,78.89C84.11,75.99 79.76,74.11 75,73.68V63.17ZM86.17,109.76C82.78,113.15 78.09,115.25 72.92,115.25C62.56,115.25 54.17,106.86 54.17,96.5C54.17,86.14 62.56,77.75 72.92,77.75C78.09,77.75 82.78,79.85 86.17,83.24L86.17,83.24L86.18,83.25C89.57,86.64 91.66,91.32 91.67,96.49L91.67,96.5C91.67,101.68 89.57,106.36 86.18,109.75L86.17,109.76L86.17,109.76ZM81.25,96.5C81.25,101.1 77.52,104.83 72.92,104.83C68.31,104.83 64.58,101.1 64.58,96.5C64.58,91.9 68.31,88.17 72.92,88.17C77.52,88.17 81.25,91.9 81.25,96.5ZM85.42,96.5C85.42,103.4 79.82,109 72.92,109C66.01,109 60.42,103.4 60.42,96.5C60.42,89.6 66.01,84 72.92,84C79.82,84 85.42,89.6 85.42,96.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M172.92,54.83C172.92,52.53 174.78,50.67 177.08,50.67H185.42C187.72,50.67 189.58,52.53 189.58,54.83V75.67C189.58,77.97 187.72,79.83 185.42,79.83H177.08C174.78,79.83 172.92,77.97 172.92,75.67V54.83Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M185.42,54.83H177.08V75.67H185.42V54.83ZM177.08,50.67C174.78,50.67 172.92,52.53 172.92,54.83V75.67C172.92,77.97 174.78,79.83 177.08,79.83H185.42C187.72,79.83 189.58,77.97 189.58,75.67V54.83C189.58,52.53 187.72,50.67 185.42,50.67H177.08Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M172.92,117.33C172.92,115.03 174.78,113.17 177.08,113.17H185.42C187.72,113.17 189.58,115.03 189.58,117.33V138.17C189.58,140.47 187.72,142.33 185.42,142.33H177.08C174.78,142.33 172.92,140.47 172.92,138.17V117.33Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M185.42,117.33H177.08V138.17H185.42V117.33ZM177.08,113.17C174.78,113.17 172.92,115.03 172.92,117.33V138.17C172.92,140.47 174.78,142.33 177.08,142.33H185.42C187.72,142.33 189.58,140.47 189.58,138.17V117.33C189.58,115.03 187.72,113.17 185.42,113.17H177.08Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M177.08,129.83V138.17H185.42V129.83H177.08Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M177.08,67.33V75.67H185.42V67.33H177.08Z"
-      android:fillColor="#AAC3EF"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M20.83,167.33H50L45.83,188.17H25L20.83,167.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M20.83,167.33L25,188.17H45.83L50,167.33H20.83ZM25.92,171.5L28.42,184H42.42L44.92,171.5H25.92Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M150,167.33H179.17L175,188.17H154.17L150,167.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M150,167.33L154.17,188.17H175L179.17,167.33H150ZM155.08,171.5L157.58,184H171.58L174.08,171.5H155.08Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        android:pathData="M26.04,171.5L27.08,177.75H43.75L44.79,171.5H26.04Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        android:pathData="M155.21,171.5L156.25,177.75H172.92L173.96,171.5H155.21Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M0,38.17C0,28.96 7.46,21.5 16.67,21.5H183.33C192.54,21.5 200,28.96 200,38.17V154.83C200,164.04 192.54,171.5 183.33,171.5H16.67C7.46,171.5 0,164.04 0,154.83V38.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M183.33,25.67H16.67C9.76,25.67 4.17,31.26 4.17,38.17V154.83C4.17,161.74 9.76,167.33 16.67,167.33H183.33C190.24,167.33 195.83,161.74 195.83,154.83V38.17C195.83,31.26 190.24,25.67 183.33,25.67ZM16.67,21.5C7.46,21.5 0,28.96 0,38.17V154.83C0,164.04 7.46,171.5 16.67,171.5H183.33C192.54,171.5 200,164.04 200,154.83V38.17C200,28.96 192.54,21.5 183.33,21.5H16.67Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M16.67,46.5C16.67,41.9 20.4,38.17 25,38.17H175C179.6,38.17 183.33,41.9 183.33,46.5V146.5C183.33,151.1 179.6,154.83 175,154.83H25C20.4,154.83 16.67,151.1 16.67,146.5V46.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M175,42.33H25C22.7,42.33 20.83,44.2 20.83,46.5V146.5C20.83,148.8 22.7,150.67 25,150.67H175C177.3,150.67 179.17,148.8 179.17,146.5V46.5C179.17,44.2 177.3,42.33 175,42.33ZM25,38.17C20.4,38.17 16.67,41.9 16.67,46.5V146.5C16.67,151.1 20.4,154.83 25,154.83H175C179.6,154.83 183.33,151.1 183.33,146.5V46.5C183.33,41.9 179.6,38.17 175,38.17H25Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M112.5,96.5C112.5,118.36 94.78,136.08 72.92,136.08C51.06,136.08 33.33,118.36 33.33,96.5C33.33,74.64 51.06,56.92 72.92,56.92C94.78,56.92 112.5,74.64 112.5,96.5Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M91.67,96.5C91.67,106.86 83.27,115.25 72.92,115.25C62.56,115.25 54.17,106.86 54.17,96.5C54.17,86.14 62.56,77.75 72.92,77.75C83.27,77.75 91.67,86.14 91.67,96.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M75,63.17C75,62.02 74.07,61.08 72.92,61.08C71.77,61.08 70.83,62.02 70.83,63.17V73.68C66.07,74.11 61.73,75.99 58.25,78.89L50.82,71.46C50.01,70.64 48.69,70.64 47.87,71.46C47.06,72.27 47.06,73.59 47.87,74.4L55.31,81.83C52.41,85.31 50.52,89.65 50.09,94.42H39.58C38.43,94.42 37.5,95.35 37.5,96.5C37.5,97.65 38.43,98.58 39.58,98.58H50.09C50.52,103.35 52.41,107.69 55.31,111.16L47.87,118.6C47.06,119.41 47.06,120.73 47.87,121.54C48.69,122.36 50.01,122.36 50.82,121.54L58.25,114.11C61.73,117.01 66.07,118.89 70.83,119.32V129.83C70.83,130.98 71.77,131.92 72.92,131.92C74.07,131.92 75,130.98 75,129.83V119.32C79.76,118.89 84.11,117.01 87.58,114.11L95.01,121.54C95.83,122.36 97.15,122.36 97.96,121.54C98.77,120.73 98.77,119.41 97.96,118.6L90.53,111.16C93.42,107.69 95.31,103.35 95.74,98.58H106.25C107.4,98.58 108.33,97.65 108.33,96.5C108.33,95.35 107.4,94.42 106.25,94.42H95.74C95.31,89.65 93.42,85.31 90.53,81.83L97.96,74.4C98.77,73.59 98.77,72.27 97.96,71.46C97.15,70.64 95.83,70.64 95.01,71.46L87.58,78.89C84.11,75.99 79.76,74.11 75,73.68V63.17ZM86.17,109.76C82.78,113.15 78.09,115.25 72.92,115.25C62.56,115.25 54.17,106.86 54.17,96.5C54.17,86.14 62.56,77.75 72.92,77.75C78.09,77.75 82.78,79.85 86.17,83.24L86.17,83.24L86.18,83.25C89.57,86.64 91.66,91.32 91.67,96.49L91.67,96.5C91.67,101.68 89.57,106.36 86.18,109.75L86.17,109.76L86.17,109.76ZM81.25,96.5C81.25,101.1 77.52,104.83 72.92,104.83C68.31,104.83 64.58,101.1 64.58,96.5C64.58,91.9 68.31,88.17 72.92,88.17C77.52,88.17 81.25,91.9 81.25,96.5ZM85.42,96.5C85.42,103.4 79.82,109 72.92,109C66.01,109 60.42,103.4 60.42,96.5C60.42,89.6 66.01,84 72.92,84C79.82,84 85.42,89.6 85.42,96.5Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M172.92,54.83C172.92,52.53 174.78,50.67 177.08,50.67H185.42C187.72,50.67 189.58,52.53 189.58,54.83V75.67C189.58,77.97 187.72,79.83 185.42,79.83H177.08C174.78,79.83 172.92,77.97 172.92,75.67V54.83Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M185.42,54.83H177.08V75.67H185.42V54.83ZM177.08,50.67C174.78,50.67 172.92,52.53 172.92,54.83V75.67C172.92,77.97 174.78,79.83 177.08,79.83H185.42C187.72,79.83 189.58,77.97 189.58,75.67V54.83C189.58,52.53 187.72,50.67 185.42,50.67H177.08Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M172.92,117.33C172.92,115.03 174.78,113.17 177.08,113.17H185.42C187.72,113.17 189.58,115.03 189.58,117.33V138.17C189.58,140.47 187.72,142.33 185.42,142.33H177.08C174.78,142.33 172.92,140.47 172.92,138.17V117.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M185.42,117.33H177.08V138.17H185.42V117.33ZM177.08,113.17C174.78,113.17 172.92,115.03 172.92,117.33V138.17C172.92,140.47 174.78,142.33 177.08,142.33H185.42C187.72,142.33 189.58,140.47 189.58,138.17V117.33C189.58,115.03 187.72,113.17 185.42,113.17H177.08Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        android:pathData="M177.08,129.83V138.17H185.42V129.83H177.08Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        android:pathData="M177.08,67.33V75.67H185.42V67.33H177.08Z" />
 </vector>
diff --git a/app/src/main/res/drawable/welcome_2.xml b/app/src/main/res/drawable/welcome_2.xml
index 93aa6f022f..7237536f9d 100644
--- a/app/src/main/res/drawable/welcome_2.xml
+++ b/app/src/main/res/drawable/welcome_2.xml
@@ -3,26 +3,32 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M8.33,21.5C8.33,14.6 13.93,9 20.83,9H125C131.9,9 137.5,14.6 137.5,21.5V125.67C137.5,132.57 131.9,138.17 125,138.17H20.83C13.93,138.17 8.33,132.57 8.33,125.67V21.5Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M125,13.17H20.83C16.23,13.17 12.5,16.9 12.5,21.5V125.67C12.5,130.27 16.23,134 20.83,134H125C129.6,134 133.33,130.27 133.33,125.67V21.5C133.33,16.9 129.6,13.17 125,13.17ZM20.83,9C13.93,9 8.33,14.6 8.33,21.5V125.67C8.33,132.57 13.93,138.17 20.83,138.17H125C131.9,138.17 137.5,132.57 137.5,125.67V21.5C137.5,14.6 131.9,9 125,9H20.83Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M29.17,40.25C29.17,34.5 33.83,29.83 39.58,29.83H54.17C55.32,29.83 56.25,30.77 56.25,31.92C56.25,33.07 55.32,34 54.17,34H39.58C36.13,34 33.33,36.8 33.33,40.25V54.83C33.33,55.98 32.4,56.92 31.25,56.92C30.1,56.92 29.17,55.98 29.17,54.83V40.25ZM89.58,31.92C89.58,30.77 90.52,29.83 91.67,29.83H106.25C112,29.83 116.67,34.5 116.67,40.25V54.83C116.67,55.98 115.73,56.92 114.58,56.92C113.43,56.92 112.5,55.98 112.5,54.83V40.25C112.5,36.8 109.7,34 106.25,34H91.67C90.52,34 89.58,33.07 89.58,31.92ZM31.25,90.25C32.4,90.25 33.33,91.18 33.33,92.33V106.92C33.33,110.37 36.13,113.17 39.58,113.17H54.17C55.32,113.17 56.25,114.1 56.25,115.25C56.25,116.4 55.32,117.33 54.17,117.33H39.58C33.83,117.33 29.17,112.67 29.17,106.92V92.33C29.17,91.18 30.1,90.25 31.25,90.25ZM114.58,90.25C115.73,90.25 116.67,91.18 116.67,92.33V106.92C116.67,112.67 112,117.33 106.25,117.33H91.67C90.52,117.33 89.58,116.4 89.58,115.25C89.58,114.1 90.52,113.17 91.67,113.17H106.25C109.7,113.17 112.5,110.37 112.5,106.92V92.33C112.5,91.18 113.43,90.25 114.58,90.25ZM54.17,56.92C55.32,56.92 56.25,57.85 56.25,59V69.42C56.25,70.57 55.32,71.5 54.17,71.5C53.02,71.5 52.08,70.57 52.08,69.42V59C52.08,57.85 53.02,56.92 54.17,56.92ZM77.08,56.92C77.08,55.77 76.15,54.83 75,54.83C73.85,54.83 72.92,55.77 72.92,56.92V77.75C72.92,78.9 71.98,79.83 70.83,79.83H66.67C65.52,79.83 64.58,80.77 64.58,81.92C64.58,83.07 65.52,84 66.67,84H70.83C74.28,84 77.08,81.2 77.08,77.75V56.92ZM72.92,96.5C68.26,96.5 63.73,95.17 59.39,92.62C58.39,92.04 57.12,92.37 56.54,93.36C55.95,94.35 56.29,95.63 57.28,96.21C62.18,99.09 67.43,100.67 72.92,100.67C78.4,100.67 83.66,99.09 88.55,96.21C89.55,95.63 89.88,94.35 89.3,93.36C88.71,92.37 87.44,92.04 86.44,92.62C82.11,95.17 77.57,96.5 72.92,96.5ZM49.09,52.39C50.79,51.23 52.48,50.67 54.17,50.67C55.85,50.67 57.54,51.23 59.24,52.39C60.19,53.04 61.49,52.79 62.13,51.84C62.79,50.89 62.54,49.6 61.59,48.95C59.33,47.4 56.83,46.5 54.17,46.5C51.5,46.5 49,47.4 46.74,48.95C45.79,49.6 45.55,50.89 46.2,51.84C46.85,52.79 48.14,53.04 49.09,52.39ZM91.67,50.67C89.98,50.67 88.29,51.23 86.59,52.39C85.64,53.04 84.35,52.79 83.7,51.84C83.05,50.89 83.29,49.6 84.24,48.95C86.5,47.4 89,46.5 91.67,46.5C94.33,46.5 96.83,47.4 99.09,48.95C100.04,49.6 100.29,50.89 99.64,51.84C98.99,52.79 97.69,53.04 96.74,52.39C95.04,51.23 93.35,50.67 91.67,50.67ZM93.75,59C93.75,57.85 92.82,56.92 91.67,56.92C90.52,56.92 89.58,57.85 89.58,59V69.42C89.58,70.57 90.52,71.5 91.67,71.5C92.82,71.5 93.75,70.57 93.75,69.42V59Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M191.67,128.79C191.67,163.88 168.35,192.33 139.58,192.33C110.82,192.33 87.5,163.88 87.5,128.79C87.5,93.7 110.82,65.25 139.58,65.25C168.35,65.25 191.67,93.7 191.67,128.79Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M139.58,188.17C165.31,188.17 187.5,162.4 187.5,128.79C187.5,95.19 165.31,69.42 139.58,69.42C113.86,69.42 91.67,95.19 91.67,128.79C91.67,162.4 113.86,188.17 139.58,188.17ZM139.58,192.33C168.35,192.33 191.67,163.88 191.67,128.79C191.67,93.7 168.35,65.25 139.58,65.25C110.82,65.25 87.5,93.7 87.5,128.79C87.5,163.88 110.82,192.33 139.58,192.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125.73,103.16C130.04,101.55 134.71,100.67 139.59,100.67C144.46,100.67 149.13,101.55 153.44,103.16C154.52,103.56 155.72,103.01 156.12,101.94C156.52,100.86 155.98,99.66 154.9,99.26C150.13,97.47 144.97,96.5 139.59,96.5C134.2,96.5 129.04,97.47 124.27,99.26C123.2,99.66 122.65,100.86 123.05,101.94C123.45,103.01 124.65,103.56 125.73,103.16ZM139.59,109C130.04,109 121.57,113.58 116.25,120.67C115.56,121.59 114.25,121.77 113.33,121.08C112.41,120.39 112.23,119.08 112.92,118.17C119,110.07 128.68,104.83 139.59,104.83C150.41,104.83 159.45,109.26 166.06,115.86C166.88,116.67 166.88,117.99 166.06,118.81C165.25,119.62 163.93,119.62 163.12,118.81C157.21,112.91 149.21,109 139.59,109ZM139.29,113.17C125.85,113.17 115.22,124.56 116.14,137.97L116.33,140.67C116.57,144.17 117.4,147.6 118.78,150.82L119.96,153.57C120.41,154.63 121.64,155.12 122.69,154.66C123.75,154.21 124.24,152.99 123.79,151.93L122.61,149.18C121.42,146.39 120.7,143.41 120.49,140.38L120.3,137.68C119.54,126.68 128.26,117.33 139.29,117.33C149.81,117.33 158.33,125.86 158.33,136.37V138.17C158.33,139.32 157.4,140.25 156.25,140.25C155.1,140.25 154.17,139.32 154.17,138.17V136.08C154.17,132.73 152.96,129.09 150.36,126.26C147.73,123.4 143.77,121.5 138.54,121.5C133.11,121.5 129.6,123.97 127.55,127.14C125.57,130.18 125,133.73 125,136.08C125,141.9 125.52,146.14 126.98,149.65C128.47,153.21 130.83,155.81 134.08,158.52C134.97,159.25 136.28,159.13 137.02,158.25C137.75,157.37 137.63,156.05 136.75,155.32C133.75,152.82 131.95,150.73 130.83,148.04C129.69,145.3 129.17,141.72 129.17,136.08C129.17,134.27 129.63,131.57 131.04,129.41C132.37,127.36 134.6,125.67 138.54,125.67C142.69,125.67 145.5,127.14 147.29,129.09C149.13,131.07 150,133.68 150,136.08V138.17C150,141.62 152.8,144.42 156.25,144.42C159.7,144.42 162.5,141.62 162.5,138.17V136.37C162.5,123.56 152.11,113.17 139.29,113.17ZM137.41,135.96C137.41,134.91 138.28,134 139.47,134C140.68,134 141.67,134.99 141.67,136.2V139.61C141.67,143.29 143.4,146.76 146.35,148.97L148.06,150.25C150.22,151.87 152.85,152.75 155.56,152.75H156.25C157.4,152.75 158.33,151.82 158.33,150.67C158.33,149.52 157.4,148.58 156.25,148.58H155.56C153.75,148.58 152,148 150.56,146.92L148.85,145.63C146.95,144.21 145.83,141.98 145.83,139.61V136.2C145.83,132.68 142.98,129.83 139.47,129.83C136.11,129.83 133.24,132.47 133.24,135.96C133.24,138.01 133.32,140.59 133.61,142.98C133.92,145.56 135.18,147.6 136.52,149.29C137.13,150.06 137.79,150.81 138.41,151.51L138.58,151.69C139.26,152.46 139.89,153.18 140.46,153.93C141.84,155.75 142.21,157.24 141.82,158.23C141.39,159.29 141.91,160.51 142.98,160.93C144.04,161.36 145.26,160.84 145.68,159.77C146.94,156.63 145.34,153.48 143.78,151.41C143.1,150.52 142.37,149.69 141.69,148.93L141.54,148.76C140.9,148.04 140.32,147.38 139.79,146.71C138.65,145.27 137.93,143.96 137.75,142.48C137.49,140.32 137.41,137.93 137.41,135.96Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M8.33,21.5C8.33,14.6 13.93,9 20.83,9H125C131.9,9 137.5,14.6 137.5,21.5V125.67C137.5,132.57 131.9,138.17 125,138.17H20.83C13.93,138.17 8.33,132.57 8.33,125.67V21.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M125,13.17H20.83C16.23,13.17 12.5,16.9 12.5,21.5V125.67C12.5,130.27 16.23,134 20.83,134H125C129.6,134 133.33,130.27 133.33,125.67V21.5C133.33,16.9 129.6,13.17 125,13.17ZM20.83,9C13.93,9 8.33,14.6 8.33,21.5V125.67C8.33,132.57 13.93,138.17 20.83,138.17H125C131.9,138.17 137.5,132.57 137.5,125.67V21.5C137.5,14.6 131.9,9 125,9H20.83Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M29.17,40.25C29.17,34.5 33.83,29.83 39.58,29.83H54.17C55.32,29.83 56.25,30.77 56.25,31.92C56.25,33.07 55.32,34 54.17,34H39.58C36.13,34 33.33,36.8 33.33,40.25V54.83C33.33,55.98 32.4,56.92 31.25,56.92C30.1,56.92 29.17,55.98 29.17,54.83V40.25ZM89.58,31.92C89.58,30.77 90.52,29.83 91.67,29.83H106.25C112,29.83 116.67,34.5 116.67,40.25V54.83C116.67,55.98 115.73,56.92 114.58,56.92C113.43,56.92 112.5,55.98 112.5,54.83V40.25C112.5,36.8 109.7,34 106.25,34H91.67C90.52,34 89.58,33.07 89.58,31.92ZM31.25,90.25C32.4,90.25 33.33,91.18 33.33,92.33V106.92C33.33,110.37 36.13,113.17 39.58,113.17H54.17C55.32,113.17 56.25,114.1 56.25,115.25C56.25,116.4 55.32,117.33 54.17,117.33H39.58C33.83,117.33 29.17,112.67 29.17,106.92V92.33C29.17,91.18 30.1,90.25 31.25,90.25ZM114.58,90.25C115.73,90.25 116.67,91.18 116.67,92.33V106.92C116.67,112.67 112,117.33 106.25,117.33H91.67C90.52,117.33 89.58,116.4 89.58,115.25C89.58,114.1 90.52,113.17 91.67,113.17H106.25C109.7,113.17 112.5,110.37 112.5,106.92V92.33C112.5,91.18 113.43,90.25 114.58,90.25ZM54.17,56.92C55.32,56.92 56.25,57.85 56.25,59V69.42C56.25,70.57 55.32,71.5 54.17,71.5C53.02,71.5 52.08,70.57 52.08,69.42V59C52.08,57.85 53.02,56.92 54.17,56.92ZM77.08,56.92C77.08,55.77 76.15,54.83 75,54.83C73.85,54.83 72.92,55.77 72.92,56.92V77.75C72.92,78.9 71.98,79.83 70.83,79.83H66.67C65.52,79.83 64.58,80.77 64.58,81.92C64.58,83.07 65.52,84 66.67,84H70.83C74.28,84 77.08,81.2 77.08,77.75V56.92ZM72.92,96.5C68.26,96.5 63.73,95.17 59.39,92.62C58.39,92.04 57.12,92.37 56.54,93.36C55.95,94.35 56.29,95.63 57.28,96.21C62.18,99.09 67.43,100.67 72.92,100.67C78.4,100.67 83.66,99.09 88.55,96.21C89.55,95.63 89.88,94.35 89.3,93.36C88.71,92.37 87.44,92.04 86.44,92.62C82.11,95.17 77.57,96.5 72.92,96.5ZM49.09,52.39C50.79,51.23 52.48,50.67 54.17,50.67C55.85,50.67 57.54,51.23 59.24,52.39C60.19,53.04 61.49,52.79 62.13,51.84C62.79,50.89 62.54,49.6 61.59,48.95C59.33,47.4 56.83,46.5 54.17,46.5C51.5,46.5 49,47.4 46.74,48.95C45.79,49.6 45.55,50.89 46.2,51.84C46.85,52.79 48.14,53.04 49.09,52.39ZM91.67,50.67C89.98,50.67 88.29,51.23 86.59,52.39C85.64,53.04 84.35,52.79 83.7,51.84C83.05,50.89 83.29,49.6 84.24,48.95C86.5,47.4 89,46.5 91.67,46.5C94.33,46.5 96.83,47.4 99.09,48.95C100.04,49.6 100.29,50.89 99.64,51.84C98.99,52.79 97.69,53.04 96.74,52.39C95.04,51.23 93.35,50.67 91.67,50.67ZM93.75,59C93.75,57.85 92.82,56.92 91.67,56.92C90.52,56.92 89.58,57.85 89.58,59V69.42C89.58,70.57 90.52,71.5 91.67,71.5C92.82,71.5 93.75,70.57 93.75,69.42V59Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M191.67,128.79C191.67,163.88 168.35,192.33 139.58,192.33C110.82,192.33 87.5,163.88 87.5,128.79C87.5,93.7 110.82,65.25 139.58,65.25C168.35,65.25 191.67,93.7 191.67,128.79Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M139.58,188.17C165.31,188.17 187.5,162.4 187.5,128.79C187.5,95.19 165.31,69.42 139.58,69.42C113.86,69.42 91.67,95.19 91.67,128.79C91.67,162.4 113.86,188.17 139.58,188.17ZM139.58,192.33C168.35,192.33 191.67,163.88 191.67,128.79C191.67,93.7 168.35,65.25 139.58,65.25C110.82,65.25 87.5,93.7 87.5,128.79C87.5,163.88 110.82,192.33 139.58,192.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M125.73,103.16C130.04,101.55 134.71,100.67 139.59,100.67C144.46,100.67 149.13,101.55 153.44,103.16C154.52,103.56 155.72,103.01 156.12,101.94C156.52,100.86 155.98,99.66 154.9,99.26C150.13,97.47 144.97,96.5 139.59,96.5C134.2,96.5 129.04,97.47 124.27,99.26C123.2,99.66 122.65,100.86 123.05,101.94C123.45,103.01 124.65,103.56 125.73,103.16ZM139.59,109C130.04,109 121.57,113.58 116.25,120.67C115.56,121.59 114.25,121.77 113.33,121.08C112.41,120.39 112.23,119.08 112.92,118.17C119,110.07 128.68,104.83 139.59,104.83C150.41,104.83 159.45,109.26 166.06,115.86C166.88,116.67 166.88,117.99 166.06,118.81C165.25,119.62 163.93,119.62 163.12,118.81C157.21,112.91 149.21,109 139.59,109ZM139.29,113.17C125.85,113.17 115.22,124.56 116.14,137.97L116.33,140.67C116.57,144.17 117.4,147.6 118.78,150.82L119.96,153.57C120.41,154.63 121.64,155.12 122.69,154.66C123.75,154.21 124.24,152.99 123.79,151.93L122.61,149.18C121.42,146.39 120.7,143.41 120.49,140.38L120.3,137.68C119.54,126.68 128.26,117.33 139.29,117.33C149.81,117.33 158.33,125.86 158.33,136.37V138.17C158.33,139.32 157.4,140.25 156.25,140.25C155.1,140.25 154.17,139.32 154.17,138.17V136.08C154.17,132.73 152.96,129.09 150.36,126.26C147.73,123.4 143.77,121.5 138.54,121.5C133.11,121.5 129.6,123.97 127.55,127.14C125.57,130.18 125,133.73 125,136.08C125,141.9 125.52,146.14 126.98,149.65C128.47,153.21 130.83,155.81 134.08,158.52C134.97,159.25 136.28,159.13 137.02,158.25C137.75,157.37 137.63,156.05 136.75,155.32C133.75,152.82 131.95,150.73 130.83,148.04C129.69,145.3 129.17,141.72 129.17,136.08C129.17,134.27 129.63,131.57 131.04,129.41C132.37,127.36 134.6,125.67 138.54,125.67C142.69,125.67 145.5,127.14 147.29,129.09C149.13,131.07 150,133.68 150,136.08V138.17C150,141.62 152.8,144.42 156.25,144.42C159.7,144.42 162.5,141.62 162.5,138.17V136.37C162.5,123.56 152.11,113.17 139.29,113.17ZM137.41,135.96C137.41,134.91 138.28,134 139.47,134C140.68,134 141.67,134.99 141.67,136.2V139.61C141.67,143.29 143.4,146.76 146.35,148.97L148.06,150.25C150.22,151.87 152.85,152.75 155.56,152.75H156.25C157.4,152.75 158.33,151.82 158.33,150.67C158.33,149.52 157.4,148.58 156.25,148.58H155.56C153.75,148.58 152,148 150.56,146.92L148.85,145.63C146.95,144.21 145.83,141.98 145.83,139.61V136.2C145.83,132.68 142.98,129.83 139.47,129.83C136.11,129.83 133.24,132.47 133.24,135.96C133.24,138.01 133.32,140.59 133.61,142.98C133.92,145.56 135.18,147.6 136.52,149.29C137.13,150.06 137.79,150.81 138.41,151.51L138.58,151.69C139.26,152.46 139.89,153.18 140.46,153.93C141.84,155.75 142.21,157.24 141.82,158.23C141.39,159.29 141.91,160.51 142.98,160.93C144.04,161.36 145.26,160.84 145.68,159.77C146.94,156.63 145.34,153.48 143.78,151.41C143.1,150.52 142.37,149.69 141.69,148.93L141.54,148.76C140.9,148.04 140.32,147.38 139.79,146.71C138.65,145.27 137.93,143.96 137.75,142.48C137.49,140.32 137.41,137.93 137.41,135.96Z" />
 </vector>
diff --git a/app/src/main/res/drawable/welcome_3.xml b/app/src/main/res/drawable/welcome_3.xml
index 315e64a4f5..4a301e69a9 100644
--- a/app/src/main/res/drawable/welcome_3.xml
+++ b/app/src/main/res/drawable/welcome_3.xml
@@ -3,38 +3,47 @@
     android:height="189dp"
     android:viewportWidth="188"
     android:viewportHeight="189">
-  <path
-      android:pathData="M154.71,94.67C154.71,128.2 127.53,155.38 94,155.38C60.47,155.38 33.29,128.2 33.29,94.67C33.29,61.14 60.47,33.96 94,33.96C127.53,33.96 154.71,61.14 154.71,94.67Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M94,35.92C61.55,35.92 35.25,62.22 35.25,94.67C35.25,127.11 61.55,153.42 94,153.42C126.45,153.42 152.75,127.11 152.75,94.67C152.75,62.22 126.45,35.92 94,35.92ZM31.33,94.67C31.33,60.06 59.39,32 94,32C128.61,32 156.67,60.06 156.67,94.67C156.67,129.28 128.61,157.33 94,157.33C59.39,157.33 31.33,129.28 31.33,94.67Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,94.67C0,81.69 10.52,71.17 23.5,71.17H164.5C177.48,71.17 188,81.69 188,94.67C188,107.64 177.48,118.17 164.5,118.17H23.5C10.52,118.17 0,107.64 0,94.67Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M164.5,75.08H23.5C12.68,75.08 3.92,83.85 3.92,94.67C3.92,105.48 12.68,114.25 23.5,114.25H164.5C175.32,114.25 184.08,105.48 184.08,94.67C184.08,83.85 175.32,75.08 164.5,75.08ZM23.5,71.17C10.52,71.17 0,81.69 0,94.67C0,107.64 10.52,118.17 23.5,118.17H164.5C177.48,118.17 188,107.64 188,94.67C188,81.69 177.48,71.17 164.5,71.17H23.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M39.17,82.92C40.25,82.92 41.13,83.83 41.13,84.96V93.13L48.45,89.24C49.45,88.71 50.66,89.05 51.17,90.01C51.68,90.96 51.28,92.17 50.29,92.7L42.38,96.9L48.7,103.68C49.47,104.5 49.45,105.77 48.66,106.51C47.87,107.25 46.61,107.18 45.84,106.35L39.17,99.2L32.49,106.35C31.73,107.18 30.46,107.25 29.67,106.51C28.88,105.77 28.86,104.5 29.63,103.68L35.95,96.9L28.05,92.7C27.05,92.17 26.66,90.96 27.16,90.01C27.67,89.05 28.89,88.71 29.88,89.24L37.21,93.13V84.96C37.21,83.83 38.09,82.92 39.17,82.92ZM70.5,82.92C71.58,82.92 72.46,83.83 72.46,84.96V93.13L79.78,89.24C80.78,88.71 82,89.05 82.5,90.01C83.01,90.96 82.62,92.17 81.62,92.7L73.72,96.9L80.04,103.68C80.81,104.5 80.79,105.77 80,106.51C79.21,107.25 77.94,107.18 77.17,106.35L70.5,99.2L63.83,106.35C63.06,107.18 61.79,107.25 61,106.51C60.21,105.77 60.19,104.5 60.96,103.68L67.29,96.9L59.38,92.7C58.38,92.17 57.99,90.96 58.5,90.01C59,89.05 60.22,88.71 61.22,89.24L68.54,93.13V84.96C68.54,83.83 69.42,82.92 70.5,82.92ZM103.79,84.96C103.79,83.83 102.92,82.92 101.83,82.92C100.75,82.92 99.88,83.83 99.88,84.96V93.13L92.55,89.24C91.56,88.71 90.34,89.05 89.83,90.01C89.32,90.96 89.72,92.17 90.71,92.7L98.62,96.9L92.3,103.68C91.53,104.5 91.55,105.77 92.34,106.51C93.13,107.25 94.39,107.18 95.16,106.35L101.83,99.2L108.51,106.35C109.28,107.18 110.54,107.25 111.33,106.51C112.12,105.77 112.14,104.5 111.37,103.68L105.05,96.9L112.96,92.7C113.95,92.17 114.35,90.96 113.84,90.01C113.33,89.05 112.11,88.71 111.12,89.24L103.79,93.13V84.96ZM119.46,104.46C119.46,103.38 120.34,102.5 121.42,102.5H137.08C138.16,102.5 139.04,103.38 139.04,104.46C139.04,105.54 138.16,106.42 137.08,106.42H121.42C120.34,106.42 119.46,105.54 119.46,104.46ZM144.92,102.5C143.84,102.5 142.96,103.38 142.96,104.46C142.96,105.54 143.84,106.42 144.92,106.42H160.58C161.66,106.42 162.54,105.54 162.54,104.46C162.54,103.38 161.66,102.5 160.58,102.5H144.92Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M114.22,180.44C136.95,175.08 155.52,161.37 167.47,143.33C168.07,142.42 169.29,142.18 170.19,142.77C171.09,143.37 171.34,144.59 170.74,145.49C158.26,164.33 138.86,178.66 115.12,184.25C76.6,193.33 38.03,176.76 17.33,145.63C16.73,144.73 16.98,143.52 17.88,142.92C18.78,142.32 19.99,142.57 20.59,143.47C40.41,173.27 77.35,189.13 114.22,180.44ZM170.12,46.41C169.22,47.01 168.01,46.77 167.41,45.87C147.59,16.06 110.65,0.2 73.78,8.89C49.64,14.58 30.18,29.69 18.38,49.42C17.82,50.35 16.62,50.65 15.69,50.09C14.76,49.54 14.46,48.33 15.02,47.41C27.34,26.81 47.67,11.02 72.88,5.08C111.4,-4 149.97,12.57 170.67,43.7C171.27,44.6 171.02,45.81 170.12,46.41Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M47,143.63C47,142.54 46.12,141.67 45.04,141.67L17.63,141.67C16.54,141.67 15.67,142.54 15.67,143.63L15.67,171.04C15.67,172.12 16.54,173 17.63,173C18.71,173 19.58,172.12 19.58,171.04L19.58,145.58L45.04,145.58C46.12,145.58 47,144.71 47,143.63Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M141,45.71C141,46.79 141.88,47.67 142.96,47.67L170.38,47.67C171.46,47.67 172.33,46.79 172.33,45.71L172.33,18.29C172.33,17.21 171.46,16.33 170.38,16.33C169.29,16.33 168.42,17.21 168.42,18.29L168.42,43.75L142.96,43.75C141.88,43.75 141,44.63 141,45.71Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M44.29,126C42.72,123.51 41.33,120.89 40.14,118.17H147.86C146.67,120.89 145.28,123.51 143.71,126H44.29Z"
-      android:fillColor="#99BAF4"
-      android:fillType="evenOdd"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M154.71,94.67C154.71,128.2 127.53,155.38 94,155.38C60.47,155.38 33.29,128.2 33.29,94.67C33.29,61.14 60.47,33.96 94,33.96C127.53,33.96 154.71,61.14 154.71,94.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M94,35.92C61.55,35.92 35.25,62.22 35.25,94.67C35.25,127.11 61.55,153.42 94,153.42C126.45,153.42 152.75,127.11 152.75,94.67C152.75,62.22 126.45,35.92 94,35.92ZM31.33,94.67C31.33,60.06 59.39,32 94,32C128.61,32 156.67,60.06 156.67,94.67C156.67,129.28 128.61,157.33 94,157.33C59.39,157.33 31.33,129.28 31.33,94.67Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M0,94.67C0,81.69 10.52,71.17 23.5,71.17H164.5C177.48,71.17 188,81.69 188,94.67C188,107.64 177.48,118.17 164.5,118.17H23.5C10.52,118.17 0,107.64 0,94.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M164.5,75.08H23.5C12.68,75.08 3.92,83.85 3.92,94.67C3.92,105.48 12.68,114.25 23.5,114.25H164.5C175.32,114.25 184.08,105.48 184.08,94.67C184.08,83.85 175.32,75.08 164.5,75.08ZM23.5,71.17C10.52,71.17 0,81.69 0,94.67C0,107.64 10.52,118.17 23.5,118.17H164.5C177.48,118.17 188,107.64 188,94.67C188,81.69 177.48,71.17 164.5,71.17H23.5Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M39.17,82.92C40.25,82.92 41.13,83.83 41.13,84.96V93.13L48.45,89.24C49.45,88.71 50.66,89.05 51.17,90.01C51.68,90.96 51.28,92.17 50.29,92.7L42.38,96.9L48.7,103.68C49.47,104.5 49.45,105.77 48.66,106.51C47.87,107.25 46.61,107.18 45.84,106.35L39.17,99.2L32.49,106.35C31.73,107.18 30.46,107.25 29.67,106.51C28.88,105.77 28.86,104.5 29.63,103.68L35.95,96.9L28.05,92.7C27.05,92.17 26.66,90.96 27.16,90.01C27.67,89.05 28.89,88.71 29.88,89.24L37.21,93.13V84.96C37.21,83.83 38.09,82.92 39.17,82.92ZM70.5,82.92C71.58,82.92 72.46,83.83 72.46,84.96V93.13L79.78,89.24C80.78,88.71 82,89.05 82.5,90.01C83.01,90.96 82.62,92.17 81.62,92.7L73.72,96.9L80.04,103.68C80.81,104.5 80.79,105.77 80,106.51C79.21,107.25 77.94,107.18 77.17,106.35L70.5,99.2L63.83,106.35C63.06,107.18 61.79,107.25 61,106.51C60.21,105.77 60.19,104.5 60.96,103.68L67.29,96.9L59.38,92.7C58.38,92.17 57.99,90.96 58.5,90.01C59,89.05 60.22,88.71 61.22,89.24L68.54,93.13V84.96C68.54,83.83 69.42,82.92 70.5,82.92ZM103.79,84.96C103.79,83.83 102.92,82.92 101.83,82.92C100.75,82.92 99.88,83.83 99.88,84.96V93.13L92.55,89.24C91.56,88.71 90.34,89.05 89.83,90.01C89.32,90.96 89.72,92.17 90.71,92.7L98.62,96.9L92.3,103.68C91.53,104.5 91.55,105.77 92.34,106.51C93.13,107.25 94.39,107.18 95.16,106.35L101.83,99.2L108.51,106.35C109.28,107.18 110.54,107.25 111.33,106.51C112.12,105.77 112.14,104.5 111.37,103.68L105.05,96.9L112.96,92.7C113.95,92.17 114.35,90.96 113.84,90.01C113.33,89.05 112.11,88.71 111.12,89.24L103.79,93.13V84.96ZM119.46,104.46C119.46,103.38 120.34,102.5 121.42,102.5H137.08C138.16,102.5 139.04,103.38 139.04,104.46C139.04,105.54 138.16,106.42 137.08,106.42H121.42C120.34,106.42 119.46,105.54 119.46,104.46ZM144.92,102.5C143.84,102.5 142.96,103.38 142.96,104.46C142.96,105.54 143.84,106.42 144.92,106.42H160.58C161.66,106.42 162.54,105.54 162.54,104.46C162.54,103.38 161.66,102.5 160.58,102.5H144.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M114.22,180.44C136.95,175.08 155.52,161.37 167.47,143.33C168.07,142.42 169.29,142.18 170.19,142.77C171.09,143.37 171.34,144.59 170.74,145.49C158.26,164.33 138.86,178.66 115.12,184.25C76.6,193.33 38.03,176.76 17.33,145.63C16.73,144.73 16.98,143.52 17.88,142.92C18.78,142.32 19.99,142.57 20.59,143.47C40.41,173.27 77.35,189.13 114.22,180.44ZM170.12,46.41C169.22,47.01 168.01,46.77 167.41,45.87C147.59,16.06 110.65,0.2 73.78,8.89C49.64,14.58 30.18,29.69 18.38,49.42C17.82,50.35 16.62,50.65 15.69,50.09C14.76,49.54 14.46,48.33 15.02,47.41C27.34,26.81 47.67,11.02 72.88,5.08C111.4,-4 149.97,12.57 170.67,43.7C171.27,44.6 171.02,45.81 170.12,46.41Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M47,143.63C47,142.54 46.12,141.67 45.04,141.67L17.63,141.67C16.54,141.67 15.67,142.54 15.67,143.63L15.67,171.04C15.67,172.12 16.54,173 17.63,173C18.71,173 19.58,172.12 19.58,171.04L19.58,145.58L45.04,145.58C46.12,145.58 47,144.71 47,143.63Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M141,45.71C141,46.79 141.88,47.67 142.96,47.67L170.38,47.67C171.46,47.67 172.33,46.79 172.33,45.71L172.33,18.29C172.33,17.21 171.46,16.33 170.38,16.33C169.29,16.33 168.42,17.21 168.42,18.29L168.42,43.75L142.96,43.75C141.88,43.75 141,44.63 141,45.71Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:fillType="evenOdd"
+        android:pathData="M44.29,126C42.72,123.51 41.33,120.89 40.14,118.17H147.86C146.67,120.89 145.28,123.51 143.71,126H44.29Z" />
 </vector>
diff --git a/app/src/main/res/drawable/welcome_4.xml b/app/src/main/res/drawable/welcome_4.xml
index 4b39372877..2518a13855 100644
--- a/app/src/main/res/drawable/welcome_4.xml
+++ b/app/src/main/res/drawable/welcome_4.xml
@@ -3,71 +3,90 @@
     android:height="201dp"
     android:viewportWidth="200"
     android:viewportHeight="201">
-  <path
-      android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z"
-      android:fillColor="#DBE5F6"/>
-  <path
-      android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M100,115.25C118.41,115.25 133.33,100.33 133.33,81.92C133.33,63.51 118.41,48.58 100,48.58C81.59,48.58 66.67,63.51 66.67,81.92C66.67,100.33 81.59,115.25 100,115.25ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-      android:fillColor="#DBE5F6"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M79.17,75.67C79.17,72.21 81.96,69.42 85.42,69.42H114.58C118.03,69.42 120.83,72.21 120.83,75.67V96.5C120.83,99.95 118.03,102.75 114.58,102.75H85.42C81.96,102.75 79.17,99.95 79.17,96.5V75.67Z"
-      android:fillColor="#FFBF00"/>
-  <path
-      android:pathData="M114.58,73.58H85.42C84.27,73.58 83.33,74.52 83.33,75.67V96.5C83.33,97.65 84.27,98.58 85.42,98.58H114.58C115.73,98.58 116.67,97.65 116.67,96.5V75.67C116.67,74.52 115.73,73.58 114.58,73.58ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M97.92,81.92C97.92,80.77 98.85,79.83 100,79.83C101.15,79.83 102.08,80.77 102.08,81.92V90.25C102.08,91.4 101.15,92.33 100,92.33C98.85,92.33 97.92,91.4 97.92,90.25V81.92Z"
-      android:fillColor="#020F66"/>
-  <path
-      android:pathData="M89.58,67.33C89.58,61.58 94.25,56.92 100,56.92C105.75,56.92 110.42,61.58 110.42,67.33V69.42H106.25V67.33C106.25,63.88 103.45,61.08 100,61.08C96.55,61.08 93.75,63.88 93.75,67.33V69.42H89.58V67.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z"
-      android:fillColor="#AAC3EF"/>
-  <path
-      android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z"
-      android:fillColor="#020F66"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z"
-      android:fillColor="#AAC3EF"/>
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M18.75,38.17C18.75,31.26 24.35,25.67 31.25,25.67H168.75C175.65,25.67 181.25,31.26 181.25,38.17V125.67C181.25,132.57 175.65,138.17 168.75,138.17H31.25C24.35,138.17 18.75,132.57 18.75,125.67V38.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M168.75,29.83H31.25C26.65,29.83 22.92,33.56 22.92,38.17V125.67C22.92,130.27 26.65,134 31.25,134H168.75C173.35,134 177.08,130.27 177.08,125.67V38.17C177.08,33.56 173.35,29.83 168.75,29.83ZM31.25,25.67C24.35,25.67 18.75,31.26 18.75,38.17V125.67C18.75,132.57 24.35,138.17 31.25,138.17H168.75C175.65,138.17 181.25,132.57 181.25,125.67V38.17C181.25,31.26 175.65,25.67 168.75,25.67H31.25Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M18.75,38.17H181.25V125.67H18.75V38.17Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M177.08,42.33H22.92V121.5H177.08V42.33ZM18.75,38.17V125.67H181.25V38.17H18.75Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:pathData="M81.25,136.08H118.75V173.58H81.25V136.08Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M79.17,134H120.83V171.5H137.5C138.65,171.5 139.58,172.43 139.58,173.58C139.58,174.73 138.65,175.67 137.5,175.67H62.5C61.35,175.67 60.42,174.73 60.42,173.58C60.42,172.43 61.35,171.5 62.5,171.5H79.17V134ZM83.33,171.5H116.67V138.17H83.33V171.5Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M0,100.67C0,96.06 3.73,92.33 8.33,92.33H45.83C50.44,92.33 54.17,96.06 54.17,100.67V167.33C54.17,171.93 50.44,175.67 45.83,175.67H8.33C3.73,175.67 0,171.93 0,167.33V100.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M45.83,96.5H8.33C6.03,96.5 4.17,98.37 4.17,100.67V167.33C4.17,169.63 6.03,171.5 8.33,171.5H45.83C48.13,171.5 50,169.63 50,167.33V100.67C50,98.37 48.13,96.5 45.83,96.5ZM8.33,92.33C3.73,92.33 0,96.06 0,100.67V167.33C0,171.93 3.73,175.67 8.33,175.67H45.83C50.44,175.67 54.17,171.93 54.17,167.33V100.67C54.17,96.06 50.44,92.33 45.83,92.33H8.33Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M20.83,102.75C20.83,101.6 21.77,100.67 22.92,100.67L31.25,100.67C32.4,100.67 33.33,101.6 33.33,102.75C33.33,103.9 32.4,104.83 31.25,104.83L22.92,104.83C21.77,104.83 20.83,103.9 20.83,102.75Z" />
+    <path
+        android:name="primary"
+        android:fillColor="#DBE5F6"
+        android:fillType="evenOdd"
+        android:pathData="M100,115.25C118.41,115.25 133.33,100.33 133.33,81.92C133.33,63.51 118.41,48.58 100,48.58C81.59,48.58 66.67,63.51 66.67,81.92C66.67,100.33 81.59,115.25 100,115.25ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z" />
+    <path
+        android:name="accent"
+        android:fillColor="#FFBF00"
+        android:pathData="M79.17,75.67C79.17,72.21 81.96,69.42 85.42,69.42H114.58C118.03,69.42 120.83,72.21 120.83,75.67V96.5C120.83,99.95 118.03,102.75 114.58,102.75H85.42C81.96,102.75 79.17,99.95 79.17,96.5V75.67Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M114.58,73.58H85.42C84.27,73.58 83.33,74.52 83.33,75.67V96.5C83.33,97.65 84.27,98.58 85.42,98.58H114.58C115.73,98.58 116.67,97.65 116.67,96.5V75.67C116.67,74.52 115.73,73.58 114.58,73.58ZM85.42,69.42C81.96,69.42 79.17,72.21 79.17,75.67V96.5C79.17,99.95 81.96,102.75 85.42,102.75H114.58C118.03,102.75 120.83,99.95 120.83,96.5V75.67C120.83,72.21 118.03,69.42 114.58,69.42H85.42Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:pathData="M97.92,81.92C97.92,80.77 98.85,79.83 100,79.83C101.15,79.83 102.08,80.77 102.08,81.92V90.25C102.08,91.4 101.15,92.33 100,92.33C98.85,92.33 97.92,91.4 97.92,90.25V81.92Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M89.58,67.33C89.58,61.58 94.25,56.92 100,56.92C105.75,56.92 110.42,61.58 110.42,67.33V69.42H106.25V67.33C106.25,63.88 103.45,61.08 100,61.08C96.55,61.08 93.75,63.88 93.75,67.33V69.42H89.58V67.33Z" />
+    <path
+        android:name="tertiary"
+        android:fillColor="#ffffff"
+        android:pathData="M125,84C125,79.4 128.73,75.67 133.33,75.67H191.67C196.27,75.67 200,79.4 200,84V167.33C200,171.94 196.27,175.67 191.67,175.67H133.33C128.73,175.67 125,171.94 125,167.33V84Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M191.67,79.83H133.33C131.03,79.83 129.17,81.7 129.17,84V167.33C129.17,169.63 131.03,171.5 133.33,171.5H191.67C193.97,171.5 195.83,169.63 195.83,167.33V84C195.83,81.7 193.97,79.83 191.67,79.83ZM133.33,75.67C128.73,75.67 125,79.4 125,84V167.33C125,171.94 128.73,175.67 133.33,175.67H191.67C196.27,175.67 200,171.94 200,167.33V84C200,79.4 196.27,75.67 191.67,75.67H133.33Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M168.75,159C168.75,162.45 165.95,165.25 162.5,165.25C159.05,165.25 156.25,162.45 156.25,159C156.25,155.55 159.05,152.75 162.5,152.75C165.95,152.75 168.75,155.55 168.75,159Z" />
+    <path
+        android:name="outline"
+        android:fillColor="#020F66"
+        android:fillType="evenOdd"
+        android:pathData="M162.5,161.08C163.65,161.08 164.58,160.15 164.58,159C164.58,157.85 163.65,156.92 162.5,156.92C161.35,156.92 160.42,157.85 160.42,159C160.42,160.15 161.35,161.08 162.5,161.08ZM162.5,165.25C165.95,165.25 168.75,162.45 168.75,159C168.75,155.55 165.95,152.75 162.5,152.75C159.05,152.75 156.25,155.55 156.25,159C156.25,162.45 159.05,165.25 162.5,165.25Z" />
+    <path
+        android:name="secondary"
+        android:fillColor="#AAC3EF"
+        android:pathData="M83.33,138.17H116.67V150.67H83.33V138.17Z" />
 </vector>
diff --git a/ui/src/main/java/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt b/ui/src/main/java/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt
index 4509074c91..4a80535cfd 100644
--- a/ui/src/main/java/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt
+++ b/ui/src/main/java/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt
@@ -65,6 +65,7 @@ data class BitwardenColorScheme(
         val reversed: Color,
         val badgeBackground: Color,
         val badgeForeground: Color,
+        val navActiveAccent: Color,
     )
 
     /**
@@ -133,5 +134,9 @@ data class BitwardenColorScheme(
     data class IllustrationColors(
         val outline: Color,
         val backgroundPrimary: Color,
+        val backgroundSecondary: Color,
+        val backgroundTertiary: Color,
+        val accent: Color,
+        val logo: Color,
     )
 }