PM-11217: Update colors to new design spec (#968)

bitwarden · Sep 25, 2024 · ad3cf96 · ad3cf96
1 parent 5d1d057
commit ad3cf96
Show file tree

Hide file tree

Showing 572 changed files with 1,097 additions and 664 deletions.
diff --git a/...lication/Support/Assets.xcassets/BackgroundColors/backgroundSplash.colorset/Contents.json b/...lication/Support/Assets.xcassets/BackgroundColors/backgroundSplash.colorset/Contents.json
@@ -5,9 +5,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0xFF",
-          "green" : "0xFF",
-          "red" : "0xFF"
+          "blue" : "0xF9",
+          "green" : "0xF6",
+          "red" : "0xF3"
         }
       },
       "idiom" : "universal"
@@ -23,9 +23,9 @@
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0x1E",
-          "green" : "0x1C",
-          "red" : "0x1C"
+          "blue" : "0x27",
+          "green" : "0x1A",
+          "red" : "0x12"
         }
       },
       "idiom" : "universal"

diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/CompleteRegistrationView.swift
@@ -102,7 +102,7 @@ struct CompleteRegistrationView: View {
             Image(decorative: Asset.Images.questionRound)
                 .resizable()
                 .frame(width: 24, height: 24)
-                .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+                .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor)
 
             VStack(alignment: .leading, spacing: 0) {
                 Text(Localizations.whatMakesAPasswordStrong)
@@ -115,13 +115,13 @@ struct CompleteRegistrationView: View {
                 } label: {
                     Text(Localizations.learnMore)
                         .styleGuide(.subheadline)
-                        .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+                        .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor)
                 }
             }
             .frame(maxWidth: .infinity, alignment: .leading)
         }
         .padding(16)
-        .background(Asset.Colors.backgroundTertiary.swiftUIColor)
+        .background(Asset.Colors.backgroundSecondary.swiftUIColor)
         .clipShape(RoundedRectangle(cornerRadius: 10))
     }
 
@@ -167,7 +167,7 @@ struct CompleteRegistrationView: View {
                         store.send(.preventAccountLockTapped)
                     } label: {
                         Text(Localizations.learnAboutWaysToPreventAccountLockout)
-                            .foregroundColor(Color(asset: Asset.Colors.primaryBitwardenLight))
+                            .foregroundColor(Asset.Colors.textInteraction.swiftUIColor)
                             .styleGuide(.footnote, weight: .bold)
                             .multilineTextAlignment(.leading)
                     }

diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/ExpiredLinkView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/ExpiredLink/ExpiredLinkView.swift
@@ -17,7 +17,7 @@ struct ExpiredLinkView: View {
             VStack(alignment: .center, spacing: 0) {
                 Image(decorative: Asset.Images.expiredLink)
                     .frame(maxWidth: .infinity)
-                    .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor)
+                    .foregroundColor(Asset.Colors.iconSecondary.swiftUIColor)
                     .padding([.bottom, .top], 32)
 
                 Text(Localizations.expiredLink)

diff --git a/...n/ExpiredLink/__Snapshots__/ExpiredLinkViewTests/test_snapshot_toggles_on.2.png b/...n/ExpiredLink/__Snapshots__/ExpiredLinkViewTests/test_snapshot_toggles_on.2.png
diff --git a/...ared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/MasterPasswordGuidanceView.swift b/...ared/UI/Auth/CompleteRegistration/MasterPasswordGuidance/MasterPasswordGuidanceView.swift
@@ -19,7 +19,7 @@ struct MasterPasswordGuidanceView: View {
 
                 detailedInstructionsView
             }
-            .background(Asset.Colors.backgroundTertiary.swiftUIColor)
+            .background(Asset.Colors.backgroundSecondary.swiftUIColor)
             .clipShape(RoundedRectangle(cornerRadius: 10))
 
             passwordGeneratorButton
@@ -80,7 +80,7 @@ struct MasterPasswordGuidanceView: View {
                     Image(decorative: Asset.Images.restart2)
                         .resizable()
                         .frame(width: 24, height: 24)
-                        .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+                        .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor)
 
                     VStack(alignment: .leading, spacing: 0) {
                         Text(Localizations.useTheGeneratorToCreateAStrongUniquePassword)
@@ -90,16 +90,16 @@ struct MasterPasswordGuidanceView: View {
 
                         Text(Localizations.tryItOut)
                             .styleGuide(.subheadline)
-                            .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+                            .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor)
                     }
                     .frame(maxWidth: .infinity, alignment: .leading)
                 }
 
                 Image(decorative: Asset.Images.rightAngle)
-                    .foregroundStyle(Asset.Colors.textSecondary.swiftUIColor)
+                    .foregroundStyle(Asset.Colors.iconPrimary.swiftUIColor)
             }
             .padding(16)
-            .background(Asset.Colors.backgroundTertiary.swiftUIColor)
+            .background(Asset.Colors.backgroundSecondary.swiftUIColor)
             .clipShape(RoundedRectangle(cornerRadius: 10))
         }
     }

diff --git a/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.1.png b/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.1.png
diff --git a/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.2.png b/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.2.png
diff --git a/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.3.png b/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.3.png
diff --git a/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.4.png b/...ts__/MasterPasswordGuidanceViewTests/test_snapshot_masterPasswordGuidance.4.png
diff --git a/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift b/BitwardenShared/UI/Auth/CompleteRegistration/PreventAccountLock/PreventAccountLockView.swift
@@ -21,7 +21,7 @@ struct PreventAccountLockView: View {
 
                 writeDownInstructions
             }
-            .background(Asset.Colors.backgroundTertiary.swiftUIColor)
+            .background(Asset.Colors.backgroundSecondary.swiftUIColor)
             .clipShape(RoundedRectangle(cornerRadius: 10))
         }
         .scrollView()
@@ -59,7 +59,7 @@ struct PreventAccountLockView: View {
                 Image(decorative: Asset.Images.lightbulb)
                     .resizable()
                     .frame(width: 32, height: 32)
-                    .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+                    .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor)
 
                 VStack(alignment: .leading, spacing: 4) {
                     Text(Localizations.createAHint)
@@ -84,7 +84,7 @@ struct PreventAccountLockView: View {
             Image(decorative: Asset.Images.pencil)
                 .resizable()
                 .frame(width: 32, height: 32)
-                .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+                .foregroundStyle(Asset.Colors.iconSecondary.swiftUIColor)
 
             VStack(alignment: .leading, spacing: 4) {
                 Text(Localizations.writeYourPasswordDown)

diff --git a/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.1.png b/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.1.png
diff --git a/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.2.png b/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.2.png
diff --git a/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.3.png b/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.3.png
diff --git a/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.4.png b/..._Snapshots__/PreventAccountLockViewTests/test_snapshot_preventAccountLock.4.png
diff --git a/.../__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.1.png b/.../__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.1.png
diff --git a/.../__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.2.png b/.../__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.2.png
diff --git a/.../__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.3.png b/.../__Snapshots__/CompleteRegistrationViewTests/test_nativeCreateAccountFlow.3.png
diff --git a/...istration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.1.png b/...istration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.1.png
diff --git a/...istration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.2.png b/...istration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.2.png
diff --git a/...istration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.3.png b/...istration/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_empty.3.png
diff --git a/...Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_hidden.1.png b/...Snapshots__/CompleteRegistrationViewTests/test_snapshot_textFields_hidden.1.png
diff --git a/...pshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.1.png b/...pshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.1.png
diff --git a/...pshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.2.png b/...pshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.2.png
diff --git a/...pshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.3.png b/...pshots__/CompleteRegistrationViewTests/test_snapshot_textFields_populated.3.png
diff --git a/...tion/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_toggles_on.1.png b/...tion/__Snapshots__/CompleteRegistrationViewTests/test_snapshot_toggles_on.1.png
diff --git a/...th/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_empty.1.png b/...th/CreateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_empty.1.png
diff --git a/...ount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_hidden.1.png b/...ount/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_hidden.1.png
diff --git a/...t/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_populated.1.png b/...t/__Snapshots__/CreateAccountViewTests/test_snapshot_textFields_populated.1.png
diff --git a/...eateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_toggles_on.1.png b/...eateAccount/__Snapshots__/CreateAccountViewTests/test_snapshot_toggles_on.1.png
diff --git a/BitwardenShared/UI/Auth/IntroCarousel/IntroCarouselView.swift b/BitwardenShared/UI/Auth/IntroCarousel/IntroCarouselView.swift
@@ -60,31 +60,35 @@ struct IntroCarouselView: View {
         @ViewBuilder imageContent: () -> some View,
         @ViewBuilder textContent: () -> some View
     ) -> some View {
-        if verticalSizeClass == .regular {
-            VStack(spacing: 80) {
-                imageContent()
-                textContent()
-            }
-            .padding(.vertical, 16)
-            .frame(maxWidth: .infinity, minHeight: minHeight)
-            .scrollView(addVerticalPadding: false)
-        } else {
-            HStack(alignment: .top, spacing: 40) {
-                VStack(spacing: 0) {
-                    Spacer(minLength: 0)
+        Group {
+            if verticalSizeClass == .regular {
+                VStack(spacing: 80) {
                     imageContent()
-                        .padding(.leading, 36)
-                        .padding(.vertical, 16)
-                    Spacer(minLength: 0)
+                    textContent()
                 }
-                .frame(minHeight: minHeight)
+                .padding(.vertical, 16)
+                .frame(maxWidth: .infinity, minHeight: minHeight)
+            } else {
+                HStack(alignment: .top, spacing: 40) {
+                    VStack(spacing: 0) {
+                        Spacer(minLength: 0)
+                        imageContent()
+                            .padding(.leading, 36)
+                            .padding(.vertical, 16)
+                        Spacer(minLength: 0)
+                    }
+                    .frame(minHeight: minHeight)
 
-                textContent()
-                    .padding(.vertical, 16)
-                    .frame(maxWidth: .infinity, minHeight: minHeight)
-                    .scrollView(addVerticalPadding: false)
+                    textContent()
+                        .padding(.vertical, 16)
+                        .frame(maxWidth: .infinity, minHeight: minHeight)
+                }
             }
         }
+        .scrollView(
+            addVerticalPadding: false,
+            backgroundColor: Asset.Colors.backgroundSecondary.swiftUIColor
+        )
     }
 
     /// A view that displays a carousel page.

diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.1.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.1.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.2.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.2.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.3.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.3.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.4.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page1.4.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.1.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.1.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.2.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.2.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.3.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.3.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.4.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page2.4.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.1.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.1.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.2.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.2.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.3.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.3.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.4.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page3.4.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.1.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.1.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.2.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.2.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.3.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.3.png
diff --git a/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.4.png b/...el/__Snapshots__/IntroCarouselViewTests/test_snapshot_introCarousel_page4.4.png
diff --git a/BitwardenShared/UI/Auth/Landing/LandingView.swift b/BitwardenShared/UI/Auth/Landing/LandingView.swift
@@ -122,13 +122,13 @@ struct LandingView: View {
                     Button(Localizations.createAccount) {
                         store.send(.createAccountPressed)
                     }
-                    .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor)
+                    .foregroundColor(Asset.Colors.textInteraction.swiftUIColor)
                 }
                 .styleGuide(.footnote)
             }
             .padding([.horizontal, .bottom], 16)
         }
-        .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea())
+        .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea())
     }
 }
 

diff --git a/...Auth/Landing/SelfHosted/__Snapshots__/SelfHostedViewTests/test_viewRender.1.png b/...Auth/Landing/SelfHosted/__Snapshots__/SelfHostedViewTests/test_viewRender.1.png
diff --git a/.../UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_email_value.1.png b/.../UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_email_value.1.png
diff --git a/...Shared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_empty.1.png b/...Shared/UI/Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_empty.1.png
diff --git a/.../Landing/__Snapshots__/LandingViewTests/test_snapshot_isRememberMeOn_true.1.png b/.../Landing/__Snapshots__/LandingViewTests/test_snapshot_isRememberMeOn_true.1.png
diff --git a/.../Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesClosed.1.png b/.../Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesClosed.1.png
diff --git a/...Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesVisible.1.png b/...Auth/Landing/__Snapshots__/LandingViewTests/test_snapshot_profilesVisible.1.png
diff --git a/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/LoginDecryptionOptionsView.swift b/BitwardenShared/UI/Auth/Login/LoginDecryptionOptions/LoginDecryptionOptionsView.swift
@@ -119,9 +119,24 @@ struct LoginDecryptionOptionsView: View {
                 await store.perform(.notYouPressed)
             }
             .accessibilityIdentifier("NotYouButton")
-            .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor)
+            .foregroundColor(Asset.Colors.textInteraction.swiftUIColor)
         }
         .styleGuide(.footnote)
         .padding(.top, 24)
     }
 }
+
+// MARK: - Previews
+
+#if DEBUG
+#Preview {
+    NavigationView {
+        LoginDecryptionOptionsView(store: Store(processor: StateProcessor(
+            state: LoginDecryptionOptionsState(
+                shouldShowContinueButton: true,
+                email: "[email protected]"
+            )
+        )))
+    }
+}
+#endif
diff --git a/...tions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.1.png b/...tions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.1.png
diff --git a/...tions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.2.png b/...tions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.2.png
diff --git a/...tions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.3.png b/...tions/__Snapshots__/LoginDecryptionOptionsViewTests/test_snapshot_default.3.png
diff --git a/BitwardenShared/UI/Auth/Login/LoginView.swift b/BitwardenShared/UI/Auth/Login/LoginView.swift
@@ -25,7 +25,7 @@ struct LoginView: View {
             .padding(.top, 16)
             .frame(maxWidth: .infinity)
         }
-        .background(Asset.Colors.backgroundSecondary.swiftUIColor.ignoresSafeArea())
+        .background(Asset.Colors.backgroundPrimary.swiftUIColor.ignoresSafeArea())
         .navigationTitle(Localizations.bitwarden)
         .navigationBarTitleDisplayMode(.inline)
         .navigationBarBackButtonHidden(true)
@@ -71,7 +71,7 @@ struct LoginView: View {
             }
             .styleGuide(.subheadline)
             .accessibilityIdentifier("GetMasterPasswordHintLabel")
-            .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor)
+            .foregroundColor(Asset.Colors.textInteraction.swiftUIColor)
         }
     }
 
@@ -128,7 +128,7 @@ struct LoginView: View {
                 store.send(.notYouPressed)
             }
             .accessibilityIdentifier("NotYouLabel")
-            .foregroundColor(Asset.Colors.primaryBitwarden.swiftUIColor)
+            .foregroundColor(Asset.Colors.textInteraction.swiftUIColor)
         }
         .styleGuide(.footnote)
     }

diff --git a/BitwardenShared/UI/Auth/Login/LoginWithDevice/LoginWithDeviceView.swift b/BitwardenShared/UI/Auth/Login/LoginWithDevice/LoginWithDeviceView.swift
@@ -49,7 +49,7 @@ struct LoginWithDeviceView: View {
                 store.send(.dismiss)
             }
             .styleGuide(.subheadline)
-            .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+            .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor)
             .accessibilityIdentifier("ViewAllLoginOptionsButton")
         }
     }
@@ -72,7 +72,7 @@ struct LoginWithDeviceView: View {
 
             Text(store.state.fingerprintPhrase ?? "")
                 .styleGuide(.bodyMonospaced)
-                .foregroundStyle(Asset.Colors.fingerprint.swiftUIColor)
+                .foregroundStyle(Asset.Colors.textCodePink.swiftUIColor)
                 .multilineTextAlignment(.leading)
                 .accessibilityIdentifier("FingerprintPhraseValue")
         }
@@ -85,7 +85,7 @@ struct LoginWithDeviceView: View {
                 await store.perform(.resendNotification)
             }
             .styleGuide(.body)
-            .foregroundStyle(Asset.Colors.primaryBitwarden.swiftUIColor)
+            .foregroundStyle(Asset.Colors.textInteraction.swiftUIColor)
             .accessibilityIdentifier("ResendNotificationButton")
         }
     }

diff --git a/...inWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.1.png b/...inWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.1.png
diff --git a/...inWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.2.png b/...inWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.2.png
diff --git a/...inWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.3.png b/...inWithDevice/__Snapshots__/LoginWithDeviceViewTests/test_snapshot_default.3.png
diff --git a/...ogin/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.1.png b/...ogin/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.1.png
diff --git a/...ogin/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.2.png b/...ogin/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.2.png
diff --git a/...ogin/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.3.png b/...ogin/SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_empty.3.png
diff --git a/.../SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.1.png b/.../SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.1.png
diff --git a/.../SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.2.png b/.../SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.2.png
diff --git a/.../SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.3.png b/.../SingleSignOn/__Snapshots__/SingleSignOnViewTests/test_snapshot_populated.3.png
diff --git a/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.1.png b/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.1.png
diff --git a/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.2.png b/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.2.png
diff --git a/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.3.png b/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp.3.png
diff --git a/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_dark.1.png b/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_dark.1.png
diff --git a/...napshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_largeText.1.png b/...napshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_largeText.1.png
diff --git a/.../__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_light.1.png b/.../__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_authApp_light.1.png
diff --git a/...ctorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.1.png b/...ctorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.1.png
diff --git a/...ctorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.2.png b/...ctorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.2.png
diff --git a/...ctorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.3.png b/...ctorAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email.3.png
diff --git a/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.1.png b/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.1.png
diff --git a/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.2.png b/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.2.png
diff --git a/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.3.png b/...h/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_email_filled.3.png
diff --git a/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.1.png b/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.1.png
diff --git a/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.2.png b/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.2.png
diff --git a/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.3.png b/...orAuth/__Snapshots__/TwoFactorAuthViewTests/test_snapshot_default_yubikey.3.png
diff --git a/...rdenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_empty.1.png b/...rdenShared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_empty.1.png
diff --git a/...d/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordHidden.1.png b/...d/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordHidden.1.png
diff --git a/...UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordRevealed.1.png b/...UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_passwordRevealed.1.png
diff --git a/...hared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_selfHosted.1.png b/...hared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_selfHosted.1.png
diff --git a/...hared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_withDevice.1.png b/...hared/UI/Auth/Login/__Snapshots__/LoginViewTests/test_snapshot_withDevice.1.png
diff --git a/BitwardenShared/UI/Auth/PasswordHint/PasswordHintView.swift b/BitwardenShared/UI/Auth/PasswordHint/PasswordHintView.swift
@@ -32,7 +32,7 @@ struct PasswordHintView: View {
             }
             .padding(16)
         }
-        .background(Asset.Colors.backgroundSecondary.swiftUIColor)
+        .background(Asset.Colors.backgroundPrimary.swiftUIColor)
         .navigationTitle(Localizations.passwordHint)
         .toolbar {
             cancelToolbarItem {

diff --git a/...Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_empty.1.png b/...Auth/PasswordHint/__Snapshots__/PasswordHintViewTests/test_snapshot_empty.1.png
diff --git a/...rdHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.1.png b/...rdHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.1.png
diff --git a/...rdHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.2.png b/...rdHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.2.png
diff --git a/...rdHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.3.png b/...rdHint/__Snapshots__/PasswordHintViewTests/test_snapshot_withEmailAddress.3.png
diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherItem.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherItem.swift
@@ -6,7 +6,7 @@ import SwiftUI
 /// Part of `ProfileSwitcherState`.
 struct ProfileSwitcherItem: Equatable, Hashable {
     /// The color associated with the profile
-    var color: Color = .init(asset: Asset.Colors.primaryBitwardenLight).opacity(0.12)
+    var color: Color = Asset.Colors.backgroundTertiary.swiftUIColor
 
     /// The account's email.
     var email: String

diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherRow.swift
@@ -85,7 +85,7 @@ struct ProfileSwitcherRow: View {
             }
             .padding([.leading], 16)
         }
-        .background(Asset.Colors.backgroundPrimary.swiftUIColor)
+        .background(Asset.Colors.backgroundSecondary.swiftUIColor)
     }
 
     /// A row divider view
@@ -94,7 +94,7 @@ struct ProfileSwitcherRow: View {
             Rectangle()
                 .frame(height: 1.0)
                 .frame(maxWidth: .infinity)
-                .foregroundColor(Asset.Colors.separatorOpaque.swiftUIColor)
+                .foregroundColor(Asset.Colors.strokeDivider.swiftUIColor)
         } else {
             EmptyView()
         }
@@ -113,7 +113,7 @@ struct ProfileSwitcherRow: View {
             .accessibilityLabel(Localizations.account)
         case .addAccount:
             Asset.Images.plus.swiftUIImage
-                .imageStyle(.rowIcon(color: Asset.Colors.primaryBitwarden.swiftUIColor))
+                .imageStyle(.rowIcon(color: Asset.Colors.iconSecondary.swiftUIColor))
                 .padding(4)
         }
     }
@@ -183,11 +183,11 @@ struct ProfileSwitcherRow: View {
     private var trailingIconColor: Color {
         switch store.state.rowType {
         case .active:
-            Asset.Colors.primaryBitwarden.swiftUIColor
+            Asset.Colors.iconPrimary.swiftUIColor
         case .alternate:
             Asset.Colors.textSecondary.swiftUIColor
         case .addAccount:
-            Asset.Colors.backgroundPrimary.swiftUIColor
+            Asset.Colors.backgroundSecondary.swiftUIColor
         }
     }
 

diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherToolbarView.swift
@@ -63,8 +63,8 @@ extension View {
                         .accessibilityHidden(initials != nil)
                 }
             }
-            .foregroundColor(textColor ?? Asset.Colors.primaryBitwarden.swiftUIColor)
-            .background(color ?? Asset.Colors.primaryBitwarden.swiftUIColor.opacity(0.12))
+            .foregroundColor(textColor ?? Asset.Colors.textInteraction.swiftUIColor)
+            .background(color ?? Asset.Colors.backgroundTertiary.swiftUIColor)
             .clipShape(Circle())
     }
 }

diff --git a/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherView.swift b/BitwardenShared/UI/Auth/ProfileSwitcher/ProfileSwitcherView.swift
@@ -21,7 +21,7 @@ struct ProfileSwitcherView: View {
                     addAccountRow
                 }
             }
-            .background(Asset.Colors.backgroundPrimary.swiftUIColor)
+            .background(Asset.Colors.backgroundSecondary.swiftUIColor)
             .transition(.move(edge: .top))
             .hidden(!store.state.isVisible)
             .fixedSize(horizontal: false, vertical: true)
@@ -67,7 +67,7 @@ struct ProfileSwitcherView: View {
         ZStack(alignment: .top) {
             Color.black.opacity(0.4)
                 .ignoresSafeArea()
-            Asset.Colors.backgroundPrimary.swiftUIColor
+            Asset.Colors.backgroundSecondary.swiftUIColor
                 .frame(height: abs(min(scrollOffset.y, 0)))
                 .fixedSize(horizontal: false, vertical: true)
         }

diff --git a/...itcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_divider.1.png b/...itcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_divider.1.png
diff --git a/...cher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_noDivider.1.png b/...cher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_active_noDivider.1.png
diff --git a/...leSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_addAccount.1.png b/...leSwitcher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_addAccount.1.png
diff --git a/...cher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_locked.1.png b/...cher/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_locked.1.png
diff --git a/...r/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_loggedOut.1.png b/...r/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_loggedOut.1.png
diff --git a/...er/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_unlocked.1.png b/...er/__Snapshots__/ProfileSwitcherRowTests/test_snapshot_alternate_unlocked.1.png
diff --git a/...ts__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_atMaximum.1.png b/...ts__/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_atMaximum.1.png
diff --git a/..._/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_belowMaximum.1.png b/..._/ProfileSwitcherViewTests/test_snapshot_multiAccount_locked_belowMaximum.1.png
diff --git a/...__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum.1.png b/...__/ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum.1.png
diff --git a/...SwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum_largeText.1.png b/...SwitcherViewTests/test_snapshot_multiAccount_unlocked_atMaximum_largeText.1.png
diff --git a/...ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_belowMaximum.1.png b/...ProfileSwitcherViewTests/test_snapshot_multiAccount_unlocked_belowMaximum.1.png
diff --git a/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.1.png b/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.1.png
diff --git a/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.2.png b/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.2.png
diff --git a/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.3.png b/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.3.png
diff --git a/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.4.png b/...ots__/ProfileSwitcherViewTests/test_snapshot_profileSwitcherView_previews.4.png
diff --git a/...itcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_singleAccount.1.png b/...itcher/__Snapshots__/ProfileSwitcherViewTests/test_snapshot_singleAccount.1.png
diff --git a/...pshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.1.png b/...pshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.1.png
diff --git a/...pshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.2.png b/...pshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.2.png
diff --git a/...pshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.3.png b/...pshots__/RemoveMasterPasswordViewTests/test_snapshot_removeMasterPassword.3.png
diff --git a/BitwardenShared/UI/Auth/SetMasterPassword/SetMasterPasswordView.swift b/BitwardenShared/UI/Auth/SetMasterPassword/SetMasterPasswordView.swift
@@ -77,7 +77,7 @@ struct SetMasterPasswordView: View {
             }
             .padding(16)
         }
-        .background(Asset.Colors.backgroundSecondary.swiftUIColor)
+        .background(Asset.Colors.backgroundPrimary.swiftUIColor)
         .navigationTitle(Localizations.setMasterPassword)
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {

diff --git a/...hots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portrait.png b/...hots__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portrait.png
diff --git a/...__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portraitDark.png b/...__/SetMasterPasswordViewTests/test_snapshot_setPassword_filled.portraitDark.png
diff --git a/...SetMasterPasswordViewTests/test_snapshot_setPassword_filled.tallPortraitAX5.png b/...SetMasterPasswordViewTests/test_snapshot_setPassword_filled.tallPortraitAX5.png
diff --git a/...terPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portrait.png b/...terPasswordViewTests/test_snapshot_setPassword_privilege_elevation.portrait.png
diff --git a/...asswordViewTests/test_snapshot_setPassword_privilege_elevation.portraitDark.png b/...asswordViewTests/test_snapshot_setPassword_privilege_elevation.portraitDark.png
diff --git a/...wordViewTests/test_snapshot_setPassword_privilege_elevation.tallPortraitAX5.png b/...wordViewTests/test_snapshot_setPassword_privilege_elevation.tallPortraitAX5.png