diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/model/VaultUnlockedNavBarTab.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/model/VaultUnlockedNavBarTab.kt
index 027348b063..8a5582c097 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/model/VaultUnlockedNavBarTab.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/model/VaultUnlockedNavBarTab.kt
@@ -18,10 +18,8 @@ import kotlinx.parcelize.Parcelize
* Represents the different tabs available in the navigation bar
* for the unlocked portion of the vault.
*
- * Each tab is modeled with properties that provide information on:
- * - Regular icon resource
- * - Icon resource when selected
- * and other essential UI and navigational data.
+ * Each tab is modeled with properties that provide information on essential UI and
+ * navigational data.
*/
@Parcelize
sealed class VaultUnlockedNavBarTab : NavigationItem, Parcelable {
@@ -30,7 +28,6 @@ sealed class VaultUnlockedNavBarTab : NavigationItem, Parcelable {
*/
@Parcelize
data object Generator : VaultUnlockedNavBarTab() {
- override val iconResSelected get() = BitwardenDrawable.ic_generator_filled
override val iconRes get() = BitwardenDrawable.ic_generator
override val labelRes get() = BitwardenString.generator
override val graphRoute get() = GeneratorGraphRoute
@@ -44,7 +41,6 @@ sealed class VaultUnlockedNavBarTab : NavigationItem, Parcelable {
*/
@Parcelize
data object Send : VaultUnlockedNavBarTab() {
- override val iconResSelected get() = BitwardenDrawable.ic_send_filled
override val iconRes get() = BitwardenDrawable.ic_send
override val labelRes get() = BitwardenString.send
override val graphRoute get() = SendGraphRoute
@@ -60,7 +56,6 @@ sealed class VaultUnlockedNavBarTab : NavigationItem, Parcelable {
data class Vault(
override val labelRes: Int,
) : VaultUnlockedNavBarTab() {
- override val iconResSelected get() = BitwardenDrawable.ic_vault_filled
override val iconRes get() = BitwardenDrawable.ic_vault
override val graphRoute get() = VaultGraphRoute
override val startDestinationRoute get() = VaultRoute
@@ -75,7 +70,6 @@ sealed class VaultUnlockedNavBarTab : NavigationItem, Parcelable {
data class Settings(
override val notificationCount: Int = 0,
) : VaultUnlockedNavBarTab() {
- override val iconResSelected get() = BitwardenDrawable.ic_settings_filled
override val iconRes get() = BitwardenDrawable.ic_settings
override val labelRes get() = BitwardenString.settings
override val graphRoute get() = SettingsGraphRoute
diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt
index 9298c77568..7fd509af47 100644
--- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt
+++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/authenticator/feature/navbar/AuthenticatorNavBarScreen.kt
@@ -143,13 +143,8 @@ private fun AuthenticatorNavBarScaffold(
* Represents the different tabs available in the navigation bar
* for the authenticator screens.
*
- * Each tab is modeled with properties that provide information on:
- * - Regular icon resource
- * - Icon resource when selected
- * and other essential UI and navigational data.
- *
- * @property iconRes The resource ID for the regular (unselected) icon representing the tab.
- * @property iconResSelected The resource ID for the icon representing the tab when it's selected.
+ * Each tab is modeled with properties that provide information on essential UI and
+ * navigational data.
*/
@Parcelize
sealed class AuthenticatorNavBarTab : NavigationItem, Parcelable {
@@ -170,7 +165,6 @@ sealed class AuthenticatorNavBarTab : NavigationItem, Parcelable {
*/
@Parcelize
data object VerificationCodes : AuthenticatorNavBarTab() {
- override val iconResSelected get() = BitwardenDrawable.ic_verification_codes_filled
override val iconRes get() = BitwardenDrawable.ic_verification_codes
override val labelRes get() = BitwardenString.verification_codes
override val graphRoute get() = ItemListingGraphRoute
@@ -184,7 +178,6 @@ sealed class AuthenticatorNavBarTab : NavigationItem, Parcelable {
*/
@Parcelize
data object Settings : AuthenticatorNavBarTab() {
- override val iconResSelected get() = BitwardenDrawable.ic_settings_filled
override val iconRes get() = BitwardenDrawable.ic_settings
override val labelRes get() = BitwardenString.settings
override val graphRoute get() = SettingsGraphRoute
diff --git a/ui/README.md b/ui/README.md
index 8d6603e658..8e748af220 100644
--- a/ui/README.md
+++ b/ui/README.md
@@ -43,5 +43,3 @@ The supported tags are as follows:
* fillTertiary
* fillAccent
* logo
-* navigation
-* navigationActiveAccent
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenBottomAppBar.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenBottomAppBar.kt
index 368063666e..7de1f4e648 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenBottomAppBar.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenBottomAppBar.kt
@@ -32,8 +32,7 @@ fun BitwardenBottomAppBar(
navigationItems.forEach { navigationItem ->
BitwardenNavigationBarItem(
labelRes = navigationItem.labelRes,
- selectedIconRes = navigationItem.iconResSelected,
- unselectedIconRes = navigationItem.iconRes,
+ iconRes = navigationItem.iconRes,
notificationCount = navigationItem.notificationCount,
isSelected = selectedItem == navigationItem,
onClick = { onClick(navigationItem) },
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationBarItem.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationBarItem.kt
index 396688440d..58fc0b65f2 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationBarItem.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationBarItem.kt
@@ -11,7 +11,6 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
@@ -28,8 +27,7 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme
* A custom Bitwarden-themed bottom app bar item.
*
* @param labelRes The custom label for the navigation item.
- * @param selectedIconRes The icon to be displayed when the navigation item is selected.
- * @param unselectedIconRes The icon to be displayed when the navigation item is not selected.
+ * @param iconRes The icon to be displayed on the navigation item.
* @param isSelected Indicates that the navigation item is selected.
* @param onClick The lambda to be invoked when the navigation item is clicked.
* @param modifier A [Modifier] that you can use to apply custom modifications to the composable.
@@ -41,8 +39,7 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme
@Composable
fun RowScope.BitwardenNavigationBarItem(
@StringRes labelRes: Int,
- @DrawableRes selectedIconRes: Int,
- @DrawableRes unselectedIconRes: Int,
+ @DrawableRes iconRes: Int,
isSelected: Boolean,
onClick: () -> Unit,
modifier: Modifier = Modifier,
@@ -60,16 +57,8 @@ fun RowScope.BitwardenNavigationBarItem(
},
) {
Icon(
- painter = rememberVectorPainter(
- id = if (isSelected) selectedIconRes else unselectedIconRes,
- ),
+ painter = rememberVectorPainter(id = iconRes),
contentDescription = null,
- tint = if (isSelected) {
- // This is unspecified because selected icons are multi-tonal.
- Color.Unspecified
- } else {
- BitwardenTheme.colorScheme.icon.primary
- },
)
}
},
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRail.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRail.kt
index 6f2baa0768..6f6e87d023 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRail.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRail.kt
@@ -65,8 +65,7 @@ fun BitwardenNavigationRail(
navigationItems.forEach { navigationItem ->
BitwardenNavigationRailItem(
labelRes = navigationItem.labelRes,
- selectedIconRes = navigationItem.iconResSelected,
- unselectedIconRes = navigationItem.iconRes,
+ iconRes = navigationItem.iconRes,
notificationCount = navigationItem.notificationCount,
isSelected = navigationItem == selectedItem,
onClick = { onClick(navigationItem) },
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRailItem.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRailItem.kt
index 9ee06f9b74..398e40d888 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRailItem.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/BitwardenNavigationRailItem.kt
@@ -9,7 +9,6 @@ import androidx.compose.material3.NavigationRailItem
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
@@ -19,14 +18,12 @@ import com.bitwarden.ui.platform.components.badge.NotificationBadge
import com.bitwarden.ui.platform.components.navigation.color.bitwardenNavigationRailItemColors
import com.bitwarden.ui.platform.components.util.rememberVectorPainter
import com.bitwarden.ui.platform.resource.BitwardenPlurals
-import com.bitwarden.ui.platform.theme.BitwardenTheme
/**
* A custom Bitwarden-themed navigation rail item.
*
* @param labelRes The custom label for the navigation item.
- * @param selectedIconRes The icon to be displayed when the navigation item is selected.
- * @param unselectedIconRes The icon to be displayed when the navigation item is not selected.
+ * @param iconRes The icon to be displayed on the navigation item.
* @param isSelected Indicates that the navigation item is selected.
* @param onClick The lambda to be invoked when the navigation item is clicked.
* @param modifier A [Modifier] that you can use to apply custom modifications to the composable.
@@ -35,8 +32,7 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme
@Composable
fun ColumnScope.BitwardenNavigationRailItem(
@StringRes labelRes: Int,
- @DrawableRes selectedIconRes: Int,
- @DrawableRes unselectedIconRes: Int,
+ @DrawableRes iconRes: Int,
isSelected: Boolean,
onClick: () -> Unit,
modifier: Modifier = Modifier,
@@ -53,16 +49,8 @@ fun ColumnScope.BitwardenNavigationRailItem(
},
) {
Icon(
- painter = rememberVectorPainter(
- id = if (isSelected) selectedIconRes else unselectedIconRes,
- ),
+ painter = rememberVectorPainter(id = iconRes),
contentDescription = null,
- tint = if (isSelected) {
- // This is unspecified because selected icons are multi-tonal.
- Color.Unspecified
- } else {
- BitwardenTheme.colorScheme.icon.primary
- },
)
}
},
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/model/NavigationItem.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/model/NavigationItem.kt
index 958c6594d7..1bca79a4a2 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/model/NavigationItem.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/navigation/model/NavigationItem.kt
@@ -4,11 +4,6 @@ package com.bitwarden.ui.platform.components.navigation.model
* Represents a user-interactable item to navigate a user via the bottom app bar or navigation rail.
*/
interface NavigationItem {
- /**
- * The resource ID for the icon representing the tab when it is selected.
- */
- val iconResSelected: Int
-
/**
* Resource id for the icon representing the tab.
*/
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/util/RememberVectorPainter.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/util/RememberVectorPainter.kt
index db595261b2..db32d6fd2e 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/util/RememberVectorPainter.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/util/RememberVectorPainter.kt
@@ -87,8 +87,6 @@ private fun ImageVector.Builder.cloneVectorGroupWithUpdatedColors(
"fillTertiary" -> SolidColor(colors.illustration.fillTertiary)
"fillAccent" -> SolidColor(colors.illustration.fillAccent)
"logo" -> SolidColor(colors.illustration.logo)
- "navigation" -> SolidColor(colors.icon.secondary)
- "navigationActiveAccent" -> SolidColor(colors.icon.navActiveAccent)
else -> vectorNode.fill
},
fillAlpha = vectorNode.fillAlpha,
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt
index 23a48c68f7..eafc35a319 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/BitwardenColorScheme.kt
@@ -68,7 +68,6 @@ data class BitwardenColorScheme(
val reversed: Color,
val badgeBackground: Color,
val badgeForeground: Color,
- val navActiveAccent: Color,
)
/**
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/ColorScheme.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/ColorScheme.kt
index 9f8ec2c577..18fef8973c 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/ColorScheme.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/theme/color/ColorScheme.kt
@@ -36,7 +36,6 @@ val darkBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme(
reversed = PrimitiveColors.gray1100,
badgeBackground = PrimitiveColors.pink200,
badgeForeground = PrimitiveColors.gray1100,
- navActiveAccent = PrimitiveColors.blue500,
),
filledButton = BitwardenColorScheme.FilledButtonColors(
background = PrimitiveColors.blue400,
@@ -137,7 +136,6 @@ val lightBitwardenColorScheme: BitwardenColorScheme = BitwardenColorScheme(
reversed = PrimitiveColors.gray100,
badgeBackground = PrimitiveColors.pink100,
badgeForeground = PrimitiveColors.gray100,
- navActiveAccent = PrimitiveColors.blue100,
),
filledButton = BitwardenColorScheme.FilledButtonColors(
background = PrimitiveColors.blue500,
@@ -245,7 +243,6 @@ internal fun dynamicBitwardenColorScheme(
reversed = materialColorScheme.inversePrimary,
badgeBackground = materialColorScheme.error,
badgeForeground = materialColorScheme.onError,
- navActiveAccent = materialColorScheme.onPrimary,
),
filledButton = BitwardenColorScheme.FilledButtonColors(
background = materialColorScheme.primary,
diff --git a/ui/src/main/res/drawable/ic_generator.xml b/ui/src/main/res/drawable/ic_generator.xml
index 0e82b1361f..6d77291c84 100644
--- a/ui/src/main/res/drawable/ic_generator.xml
+++ b/ui/src/main/res/drawable/ic_generator.xml
@@ -1,29 +1,9 @@
-
-
-
-
-
-
-
-
+ android:viewportHeight="24"
+ android:viewportWidth="24">
+
diff --git a/ui/src/main/res/drawable/ic_generator_filled.xml b/ui/src/main/res/drawable/ic_generator_filled.xml
deleted file mode 100644
index 963d55bdf7..0000000000
--- a/ui/src/main/res/drawable/ic_generator_filled.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ui/src/main/res/drawable/ic_send.xml b/ui/src/main/res/drawable/ic_send.xml
index 9dd7b79274..542dc86e7e 100644
--- a/ui/src/main/res/drawable/ic_send.xml
+++ b/ui/src/main/res/drawable/ic_send.xml
@@ -1,10 +1,10 @@
-
+ android:viewportHeight="24"
+ android:viewportWidth="24">
+
diff --git a/ui/src/main/res/drawable/ic_send_filled.xml b/ui/src/main/res/drawable/ic_send_filled.xml
deleted file mode 100644
index de9d3b1f3f..0000000000
--- a/ui/src/main/res/drawable/ic_send_filled.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
diff --git a/ui/src/main/res/drawable/ic_settings.xml b/ui/src/main/res/drawable/ic_settings.xml
index 7387e00ab2..6d6e4048ee 100644
--- a/ui/src/main/res/drawable/ic_settings.xml
+++ b/ui/src/main/res/drawable/ic_settings.xml
@@ -1,14 +1,13 @@
+ android:viewportHeight="24"
+ android:viewportWidth="24">
+
-
+ android:pathData="M13.293,0.875C13.721,0.875 14.094,1.018 14.407,1.301C14.679,1.546 14.859,1.843 14.944,2.189L14.976,2.34L14.977,2.345L15.251,4.448C15.579,4.571 15.88,4.712 16.151,4.873C16.421,5.033 16.692,5.22 16.965,5.433L18.966,4.618C19.36,4.447 19.76,4.432 20.16,4.575C20.507,4.7 20.788,4.907 21,5.196L21.087,5.325L21.088,5.328L22.392,7.566L22.467,7.705C22.626,8.032 22.666,8.378 22.583,8.738C22.49,9.146 22.275,9.483 21.942,9.747L21.94,9.749L20.208,11.038C20.241,11.202 20.261,11.358 20.265,11.506C20.268,11.669 20.271,11.834 20.271,12C20.271,12.159 20.267,12.321 20.259,12.485C20.252,12.635 20.228,12.801 20.191,12.983L21.888,14.251L21.891,14.253C22.223,14.516 22.44,14.854 22.537,15.261C22.635,15.673 22.572,16.066 22.351,16.434L21.029,18.684C20.809,19.049 20.496,19.303 20.095,19.441C19.691,19.581 19.288,19.564 18.893,19.392L16.964,18.567C16.69,18.781 16.41,18.972 16.125,19.139C15.841,19.305 15.548,19.442 15.25,19.552L14.976,21.655V21.66C14.908,22.071 14.717,22.419 14.407,22.699C14.094,22.982 13.721,23.125 13.293,23.125H10.707C10.279,23.125 9.906,22.982 9.593,22.699C9.283,22.419 9.092,22.071 9.024,21.66L9.023,21.656L8.749,19.565C8.452,19.46 8.148,19.321 7.84,19.146C7.531,18.969 7.252,18.779 7.002,18.579L5.048,19.403L5.047,19.402C4.653,19.574 4.252,19.593 3.853,19.453C3.455,19.314 3.144,19.06 2.924,18.696L2.923,18.694L1.608,16.434L1.533,16.295C1.374,15.968 1.334,15.622 1.417,15.262C1.51,14.854 1.725,14.517 2.058,14.253L2.061,14.251L3.749,12.991C3.728,12.841 3.712,12.69 3.702,12.538C3.691,12.362 3.685,12.186 3.685,12.011C3.685,11.843 3.691,11.674 3.702,11.501C3.712,11.349 3.728,11.184 3.75,11.008L2.061,9.749L2.058,9.747C1.724,9.483 1.511,9.142 1.422,8.73C1.332,8.316 1.399,7.922 1.62,7.556L2.923,5.328L2.925,5.325C3.145,4.969 3.455,4.717 3.852,4.575C4.251,4.432 4.652,4.447 5.046,4.619L6.99,5.433C7.26,5.225 7.546,5.035 7.849,4.861C8.149,4.689 8.445,4.548 8.737,4.438L9.024,2.344V2.34C9.092,1.929 9.283,1.581 9.593,1.301C9.906,1.018 10.279,0.875 10.707,0.875H13.293ZM10.589,5.843L10.578,5.93L10.493,5.949C9.909,6.086 9.371,6.296 8.878,6.577C8.384,6.859 7.912,7.224 7.461,7.671L7.402,7.729L7.325,7.697L4.526,6.541L3.489,8.318L5.919,10.116L5.993,10.171L5.963,10.258C5.869,10.524 5.802,10.802 5.765,11.09C5.727,11.381 5.707,11.688 5.707,12.011C5.707,12.307 5.727,12.597 5.765,12.881C5.803,13.163 5.866,13.442 5.953,13.717L5.98,13.801L5.909,13.854L3.488,15.68L4.526,17.458L7.313,16.285L7.392,16.252L7.451,16.313C7.886,16.756 8.351,17.118 8.844,17.4C9.337,17.682 9.884,17.899 10.484,18.051L10.567,18.072L10.578,18.157L10.943,21.138H13.018L13.422,18.145L13.434,18.062L13.515,18.04C14.1,17.888 14.634,17.674 15.116,17.396C15.599,17.117 16.066,16.758 16.518,16.317L16.576,16.26L16.652,16.291L19.45,17.457L20.488,15.68L18.047,13.854L17.976,13.802L18.003,13.716C18.098,13.423 18.162,13.137 18.196,12.857C18.231,12.575 18.248,12.289 18.248,12C18.248,11.703 18.231,11.417 18.196,11.143C18.162,10.871 18.098,10.592 18.003,10.307L17.975,10.222L18.047,10.168L20.511,8.319L19.473,6.542L16.642,7.727L16.562,7.76L16.502,7.696C16.121,7.292 15.663,6.933 15.127,6.621C14.591,6.309 14.051,6.089 13.506,5.96L13.421,5.94L13.411,5.854L13.056,2.862H10.962L10.589,5.843Z" />
diff --git a/ui/src/main/res/drawable/ic_settings_filled.xml b/ui/src/main/res/drawable/ic_settings_filled.xml
deleted file mode 100644
index 5fe0e90b50..0000000000
--- a/ui/src/main/res/drawable/ic_settings_filled.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
diff --git a/ui/src/main/res/drawable/ic_vault.xml b/ui/src/main/res/drawable/ic_vault.xml
index 501b1ea79a..96732e8819 100644
--- a/ui/src/main/res/drawable/ic_vault.xml
+++ b/ui/src/main/res/drawable/ic_vault.xml
@@ -1,14 +1,14 @@
+ android:viewportHeight="24"
+ android:viewportWidth="24">
+ android:pathData="M21,3C22.105,3 23,3.9 23,5.01V18.077L22.989,18.282C22.894,19.228 22.146,19.98 21.204,20.076L21,20.087H19.107V20.995C19.107,21.55 18.66,22 18.107,22C17.555,22 17.108,21.55 17.107,20.995V20.087H6.889V20.995C6.889,21.55 6.441,22 5.889,22C5.337,22 4.889,21.55 4.889,20.995V20.087H3L2.796,20.076C1.788,19.973 1,19.117 1,18.077V5.01C1,3.9 1.896,3 3,3H21ZM3,18.077H21V16.066H19.787C19.235,16.066 18.787,15.616 18.787,15.061C18.787,14.506 19.235,14.056 19.787,14.056H21V9.533H19.787C19.235,9.533 18.787,9.083 18.787,8.528C18.787,7.973 19.235,7.523 19.787,7.523H21V5.01H3V18.077Z" />
+ android:pathData="M9,7.02C9.55,7.02 9.999,7.474 9.999,8.03V8.747C10.328,8.868 10.629,9.039 10.898,9.261L11.497,8.908C11.976,8.636 12.586,8.797 12.865,9.282C13.135,9.766 12.975,10.382 12.496,10.665L11.916,11.008C11.946,11.18 11.967,11.362 11.967,11.544C11.967,11.725 11.946,11.907 11.916,12.078L12.496,12.421C12.975,12.704 13.145,13.32 12.865,13.804C12.676,14.127 12.346,14.309 11.996,14.309C11.827,14.309 11.657,14.269 11.497,14.178L10.898,13.825C10.629,14.047 10.328,14.219 9.999,14.34V15.057C9.999,15.612 9.55,16.066 9,16.066C8.451,16.066 8.002,15.612 8.002,15.057V14.32C7.692,14.199 7.403,14.016 7.153,13.804L6.504,14.178C6.344,14.269 6.174,14.309 6.004,14.309C5.655,14.309 5.325,14.127 5.135,13.804C4.866,13.32 5.026,12.704 5.505,12.421L6.154,12.038C6.124,11.876 6.105,11.715 6.105,11.544C6.105,11.372 6.124,11.21 6.154,11.049L5.505,10.665C5.026,10.382 4.856,9.766 5.135,9.282C5.415,8.797 6.024,8.626 6.504,8.908L7.153,9.282C7.403,9.07 7.682,8.888 8.002,8.767V8.03C8.002,7.475 8.451,7.02 9,7.02ZM9.031,10.203C8.304,10.203 7.706,10.809 7.706,11.544C7.706,12.278 8.304,12.883 9.031,12.883C9.757,12.883 10.355,12.278 10.355,11.544C10.355,10.809 9.757,10.203 9.031,10.203Z" />
diff --git a/ui/src/main/res/drawable/ic_vault_filled.xml b/ui/src/main/res/drawable/ic_vault_filled.xml
deleted file mode 100644
index 539de4bde3..0000000000
--- a/ui/src/main/res/drawable/ic_vault_filled.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
diff --git a/ui/src/main/res/drawable/ic_verification_codes.xml b/ui/src/main/res/drawable/ic_verification_codes.xml
index 3be95360d0..b3baacf7b3 100644
--- a/ui/src/main/res/drawable/ic_verification_codes.xml
+++ b/ui/src/main/res/drawable/ic_verification_codes.xml
@@ -1,18 +1,18 @@
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
+ android:pathData="M16.546,8.455C16.903,8.815 16.9,9.395 16.541,9.751L10.993,15.251C10.636,15.606 10.06,15.606 9.703,15.251L7,12.572C6.641,12.215 6.638,11.635 6.995,11.276C7.351,10.916 7.932,10.913 8.291,11.27L10.348,13.31L15.25,8.449C15.61,8.093 16.19,8.096 16.546,8.455Z" />
+ android:pathData="M12,0.851C11.494,0.851 11.084,1.261 11.084,1.767C11.084,2.274 11.494,2.684 12,2.684C17.063,2.684 21.167,6.788 21.167,11.851C21.167,16.913 17.063,21.017 12,21.017C8.027,21.017 4.643,18.489 3.371,14.951C3.2,14.474 2.675,14.227 2.199,14.398C1.722,14.569 1.475,15.094 1.646,15.571C3.171,19.814 7.23,22.851 12,22.851C18.075,22.851 23,17.926 23,11.851C23,5.775 18.075,0.851 12,0.851Z" />
+ android:pathData="M12,2.684C11.849,2.684 11.698,2.687 11.549,2.695C11.043,2.719 10.614,2.329 10.589,1.823C10.565,1.318 10.955,0.888 11.46,0.863C11.639,0.855 11.82,0.851 12,0.851C12.507,0.851 12.916,1.261 12.916,1.767C12.916,2.273 12.507,2.684 12,2.684ZM9.465,2.045C9.635,2.522 9.387,3.046 8.911,3.217C8.627,3.319 8.35,3.434 8.08,3.561C7.623,3.778 7.076,3.583 6.859,3.126C6.643,2.668 6.838,2.121 7.295,1.905C7.619,1.751 7.952,1.613 8.293,1.491C8.77,1.32 9.294,1.568 9.465,2.045ZM5.907,3.763C6.247,4.138 6.219,4.718 5.844,5.058C5.622,5.26 5.409,5.472 5.208,5.695C4.867,6.07 4.288,6.098 3.913,5.758C3.538,5.418 3.509,4.838 3.85,4.463C4.091,4.196 4.346,3.942 4.613,3.7C4.988,3.36 5.567,3.388 5.907,3.763ZM3.275,6.71C3.733,6.927 3.928,7.473 3.711,7.931C3.583,8.201 3.468,8.478 3.367,8.761C3.196,9.238 2.671,9.486 2.195,9.315C1.718,9.145 1.47,8.62 1.64,8.144C1.762,7.803 1.901,7.47 2.054,7.146C2.271,6.688 2.818,6.493 3.275,6.71ZM1.973,10.44C2.478,10.464 2.869,10.894 2.844,11.4C2.837,11.549 2.833,11.699 2.833,11.85C2.833,12.039 2.839,12.226 2.85,12.411C2.881,12.916 2.496,13.351 1.99,13.381C1.485,13.412 1.051,13.027 1.02,12.521C1.007,12.299 1,12.076 1,11.85C1,11.67 1.004,11.49 1.013,11.311C1.037,10.806 1.467,10.415 1.973,10.44ZM2.442,15.199C2.902,14.989 3.446,15.192 3.656,15.652C3.734,15.822 3.816,15.99 3.904,16.154C4.142,16.601 3.973,17.156 3.526,17.394C3.079,17.632 2.524,17.463 2.286,17.016C2.181,16.819 2.082,16.618 1.988,16.414C1.778,15.953 1.981,15.409 2.442,15.199Z" />
diff --git a/ui/src/main/res/drawable/ic_verification_codes_filled.xml b/ui/src/main/res/drawable/ic_verification_codes_filled.xml
deleted file mode 100644
index 3388ecc38c..0000000000
--- a/ui/src/main/res/drawable/ic_verification_codes_filled.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-