diff --git a/Example/src/components/ExampleSection.tsx b/Example/src/components/ExampleSection.tsx
index b6859f46b..4c4694eeb 100644
--- a/Example/src/components/ExampleSection.tsx
+++ b/Example/src/components/ExampleSection.tsx
@@ -23,7 +23,7 @@ export function ExampleSection({ title, children }: { title: string; children: R
                     marginHorizontal: '2%',
                     marginTop: 20,
                     borderBottomWidth: 1,
-                    borderBottomColor: theme[ColorVariants.LineNeutral],
+                    borderBottomColor: theme[ColorVariants.BackgroundInverted],
                 }}
             >
                 <UILabel>{title}</UILabel>
diff --git a/Example/src/screens/Inputs.tsx b/Example/src/screens/Inputs.tsx
index 55bc86bed..c8a3ccf60 100644
--- a/Example/src/screens/Inputs.tsx
+++ b/Example/src/screens/Inputs.tsx
@@ -119,7 +119,7 @@ export const Inputs = () => {
                     >
                         <UIMaterialTextView.Icon
                             source={UIAssets.icons.ui.buttonClose}
-                            tintColor={ColorVariants.IconSecondary}
+                            tintColor={ColorVariants.TextSecondary}
                         />
                     </UIMaterialTextView>
                     <View style={{ height: 20 }} />
@@ -131,11 +131,11 @@ export const Inputs = () => {
                     >
                         <UIMaterialTextView.Icon
                             source={UIAssets.icons.ui.buttonPlus}
-                            tintColor={ColorVariants.IconSecondary}
+                            tintColor={ColorVariants.TextSecondary}
                         />
                         <UIMaterialTextView.Icon
                             source={UIAssets.icons.ui.buttonClose}
-                            tintColor={ColorVariants.IconSecondary}
+                            tintColor={ColorVariants.TextSecondary}
                         />
                     </UIMaterialTextView>
                     <View style={{ height: 20 }} />
diff --git a/Example/src/screens/LargeHeader.tsx b/Example/src/screens/LargeHeader.tsx
index 9cd76ba60..10cc73327 100644
--- a/Example/src/screens/LargeHeader.tsx
+++ b/Example/src/screens/LargeHeader.tsx
@@ -83,7 +83,7 @@ const renderBelowContent = () => {
                 marginVertical: 8,
             }}
         >
-            <UILabel color={UILabelColors.TextPrimaryInverted}>
+            <UILabel color={UILabelColors.TextInverted}>
                 A thing happened and it takes three whole lines to explain that it happened. This
                 isn’t likely in English but maybe in German. A thing happened and it takes three
                 whole lines to explain that it happened. This isn’t likely in English but maybe in
diff --git a/Example/src/screens/Lists.tsx b/Example/src/screens/Lists.tsx
index 2c1a70bfa..1f1859191 100644
--- a/Example/src/screens/Lists.tsx
+++ b/Example/src/screens/Lists.tsx
@@ -71,10 +71,7 @@ const Footer = React.memo(() => {
                 justifyContent: 'center',
             }}
         >
-            <UILabel
-                role={TypographyVariants.HeadersHuge}
-                color={ColorVariants.TextPrimaryInverted}
-            >
+            <UILabel role={TypographyVariants.HeadersHuge} color={ColorVariants.TextInverted}>
                 Loading...
             </UILabel>
         </View>
@@ -112,7 +109,7 @@ function MasonryList() {
                 >
                     <UILabel
                         role={TypographyVariants.HeadersHuge}
-                        color={ColorVariants.TextPrimaryInverted}
+                        color={ColorVariants.TextInverted}
                     >
                         {item.index}
                     </UILabel>
diff --git a/Example/src/screens/Navigation.tsx b/Example/src/screens/Navigation.tsx
index 4b612059c..3bcca1213 100644
--- a/Example/src/screens/Navigation.tsx
+++ b/Example/src/screens/Navigation.tsx
@@ -270,7 +270,7 @@ export const Navigation = () => {
                                 icon: {
                                     source: UIAssets.icons.ui.camera,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
@@ -279,19 +279,19 @@ export const Navigation = () => {
                                         width: 25,
                                     },
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.glass,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.triangle,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                         ]}
                         headerRightItems={[
@@ -299,7 +299,7 @@ export const Navigation = () => {
                                 icon: {
                                     source: UIAssets.icons.ui.camera,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
@@ -308,19 +308,19 @@ export const Navigation = () => {
                                         width: 25,
                                     },
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.glass,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.triangle,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                         ]}
                     />
@@ -408,7 +408,7 @@ export const Navigation = () => {
                                 icon: {
                                     source: UIAssets.icons.ui.camera,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
@@ -417,19 +417,19 @@ export const Navigation = () => {
                                         width: 25,
                                     },
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.glass,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.triangle,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                         ]}
                         headerRightItems={[
@@ -437,7 +437,7 @@ export const Navigation = () => {
                                 icon: {
                                     source: UIAssets.icons.ui.camera,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
@@ -446,19 +446,19 @@ export const Navigation = () => {
                                         width: 25,
                                     },
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.glass,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                             {
                                 icon: {
                                     source: UIAssets.icons.ui.triangle,
                                 },
-                                iconTintColor: ColorVariants.IconSecondary,
+                                iconTintColor: ColorVariants.TextSecondary,
                             },
                         ]}
                     />
diff --git a/casts/addressText/src/UIAddressTextView.tsx b/casts/addressText/src/UIAddressTextView.tsx
index c0873dafc..a82914cd3 100644
--- a/casts/addressText/src/UIAddressTextView.tsx
+++ b/casts/addressText/src/UIAddressTextView.tsx
@@ -161,7 +161,7 @@ export const UIAddressTextView = React.forwardRef<UIMaterialTextViewRef, UIAddre
                     onPress={() => {
                         setQrVisible(prevQRVisible => !prevQRVisible);
                     }}
-                    tintColor={ColorVariants.LineNeutral}
+                    tintColor={ColorVariants.BackgroundInverted}
                 />
             );
         }, [qrCode]);
diff --git a/casts/banner/src/UIBanner.tsx b/casts/banner/src/UIBanner.tsx
index 7d3e27602..7494448d3 100644
--- a/casts/banner/src/UIBanner.tsx
+++ b/casts/banner/src/UIBanner.tsx
@@ -37,7 +37,7 @@ export function UIBanner(props: Props) {
         >
             <UILabel
                 role={UILabelRoles.ActionCallout}
-                color={textColor || UILabelColors.TextPrimaryInverted}
+                color={textColor || UILabelColors.TextInverted}
             >
                 {text}
             </UILabel>
diff --git a/casts/bars/src/UIHeaderItems.tsx b/casts/bars/src/UIHeaderItems.tsx
index f33af7d17..95dd9361e 100644
--- a/casts/bars/src/UIHeaderItems.tsx
+++ b/casts/bars/src/UIHeaderItems.tsx
@@ -55,7 +55,7 @@ function UIHeaderActionItem({ disabled, label, accessibilityLabel }: HeaderItem)
     return (
         <UILabel
             role={UILabelRoles.Action}
-            color={disabled ? UILabelColors.TextNeutral : UILabelColors.TextAccent}
+            color={disabled ? UILabelColors.TextSecondary : UILabelColors.TextAccent}
             accessibilityLabel={accessibilityLabel}
         >
             {label}
@@ -73,7 +73,7 @@ function UIHeaderIconItem({
         return iconElement;
     }
 
-    const tintColor = disabled ? ColorVariants.IconNeutral : iconTintColor;
+    const tintColor = disabled ? ColorVariants.TextTertiary : iconTintColor;
 
     if (icon) {
         if (typeof icon === 'function') {
diff --git a/casts/bars/src/UISearchBar.tsx b/casts/bars/src/UISearchBar.tsx
index a5c8ce628..11e3fc0b8 100644
--- a/casts/bars/src/UISearchBar.tsx
+++ b/casts/bars/src/UISearchBar.tsx
@@ -177,7 +177,7 @@ export function UISearchBar({
                 <UIImage
                     source={UIAssets.icons.ui.search}
                     style={styles.searchIcon}
-                    tintColor={ColorVariants.IconSecondary}
+                    tintColor={ColorVariants.TextSecondary}
                 />
                 <UITextView
                     ref={ref}
diff --git a/casts/bars/src/UISearchBarButton.tsx b/casts/bars/src/UISearchBarButton.tsx
index 13c11066a..feb7d6bcd 100644
--- a/casts/bars/src/UISearchBarButton.tsx
+++ b/casts/bars/src/UISearchBarButton.tsx
@@ -59,7 +59,7 @@ export function UISearchBarButton({
                         <UIImage
                             source={UIAssets.icons.ui.search}
                             style={styles.searchIcon}
-                            tintColor={ColorVariants.IconSecondary}
+                            tintColor={ColorVariants.TextSecondary}
                         />
                         <UILabel
                             role={UILabelRoles.ParagraphText}
diff --git a/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx b/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx
index 976d5265e..1b89f147e 100644
--- a/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx
+++ b/casts/countryPicker/src/UICountryPicker/CountryPicker.tsx
@@ -232,7 +232,7 @@ const useStyles = makeStyles((theme: Theme) => ({
     },
     headerContainer: {
         backgroundColor: theme[ColorVariants.BackgroundPrimary] as string,
-        borderBottomColor: theme[ColorVariants.LineTertiary] as string,
+        borderBottomColor: theme[ColorVariants.BackgroundTertiary] as string,
         borderBottomWidth: 1,
         borderTopLeftRadius: 12,
         borderTopRightRadius: 12,
diff --git a/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx b/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx
index dc1bc0df9..7f187e0a1 100644
--- a/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx
+++ b/casts/countryPicker/src/UICountryPicker/CountryPickerRow.tsx
@@ -47,7 +47,7 @@ const useStyles = makeStyles((theme: Theme) => ({
     rowContainerInner: {
         paddingVertical: UILayoutConstant.contentOffset,
         flexDirection: 'row',
-        borderBottomColor: theme[ColorVariants.LineTertiary] as string,
+        borderBottomColor: theme[ColorVariants.BackgroundTertiary] as string,
         borderBottomWidth: 1,
     },
     rowContainer: {
diff --git a/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx b/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx
index 337b0ef2b..a9a11d831 100644
--- a/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx
+++ b/casts/dateTimePicker/src/UIDateTimePicker/Calendar/DateControls.tsx
@@ -84,7 +84,7 @@ const useStyles = makeStyles((theme: Theme) => ({
     separator: {
         height: 12,
         width: 1,
-        backgroundColor: theme[ColorVariants.BackgroundTertiaryInverted],
+        backgroundColor: theme[ColorVariants.BackgroundTertiary],
         marginHorizontal: UILayoutConstant.normalContentOffset,
     },
     arrows: {
diff --git a/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx b/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx
index 46f3e42c7..3474baf28 100644
--- a/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx
+++ b/casts/dateTimePicker/src/UIDateTimePicker/DateTimePicker.tsx
@@ -79,7 +79,10 @@ function Content() {
             return (
                 <>
                     <Calendar />
-                    <UIBackgroundView color={ColorVariants.LineTertiary} style={styles.divider} />
+                    <UIBackgroundView
+                        color={ColorVariants.BackgroundTertiary}
+                        style={styles.divider}
+                    />
                     <Time />
                 </>
             );
diff --git a/casts/dateTimePicker/src/UIDateTimePicker/Time/Time.tsx b/casts/dateTimePicker/src/UIDateTimePicker/Time/Time.tsx
index 29fbd4a08..c9c2055eb 100644
--- a/casts/dateTimePicker/src/UIDateTimePicker/Time/Time.tsx
+++ b/casts/dateTimePicker/src/UIDateTimePicker/Time/Time.tsx
@@ -57,7 +57,7 @@ const TimeInput = React.forwardRef<UITextViewRef, TimeInputProps>(function TimeI
                 [TIME_INPUT_IS_NOT_IN_FOCUS, TIME_INPUT_IS_IN_FOCUS],
                 [
                     theme[ColorVariants.BackgroundTertiary] as string,
-                    theme[ColorVariants.LineAccent] as string,
+                    theme[ColorVariants.BackgroundAccent] as string,
                 ],
             ),
             backgroundColor: theme[ColorVariants.BackgroundTertiary],
diff --git a/casts/linearChart/src/Linear/LinearChart.tsx b/casts/linearChart/src/Linear/LinearChart.tsx
index 8d4a7f17b..4831e0367 100644
--- a/casts/linearChart/src/Linear/LinearChart.tsx
+++ b/casts/linearChart/src/Linear/LinearChart.tsx
@@ -139,7 +139,7 @@ export const LinearChart: React.FC<IProps> = ({ data, testID }: IProps) => {
                         animatedProps={animatedPathProps}
                         fill="transparent"
                         // @ts-ignore
-                        stroke={theme[ColorVariants.LineAccent]}
+                        stroke={theme[ColorVariants.BackgroundAccent]}
                         strokeWidth={LINEAR_CHART_STROKE_WIDTH}
                     />
                 </AnimatedSvg>
diff --git a/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx b/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx
index 018502c5d..9ee6f149a 100644
--- a/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx
+++ b/casts/pagerView/src/UIPagerView/UIPagerViewContainer.tsx
@@ -307,7 +307,7 @@ export const UIPagerViewContainer: React.FC<UIPagerViewContainerProps> = ({
     const renderTabBar: TabBarComponent = useTabBar(
         pages,
         theme.TextPrimary,
-        theme.LinePrimary,
+        theme.BackgroundPrimary,
         type,
     );
 
diff --git a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx
index c67dca043..95a5b7d40 100644
--- a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx
+++ b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.native.tsx
@@ -18,7 +18,7 @@ export function QRCodeScanner(props: React.ComponentProps<typeof QRCodeScannerNa
                 <View style={styles.errorContainer}>
                     <UILabel
                         role={UILabelRoles.TitleMedium}
-                        color={UILabelColors.TextPrimaryInverted}
+                        color={UILabelColors.TextInverted}
                         style={styles.errorText}
                     >
                         {uiLocalized.QRCodeScanner.ErrorPermissions}
diff --git a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx
index bff9fa3b2..daf3b7bdc 100644
--- a/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx
+++ b/casts/qrCodeScannerSheet/src/QRCodeScanner/QRCodeScanner.web.tsx
@@ -57,7 +57,7 @@ export function QRCodeScanner(props: QRCodeScannerProps) {
             <View style={[styles.errorContainer, props.containerStyle]}>
                 <UILabel
                     role={UILabelRoles.TitleMedium}
-                    color={UILabelColors.TextPrimaryInverted}
+                    color={UILabelColors.TextInverted}
                     style={styles.errorText}
                 >
                     {uiLocalized.QRCodeScanner.ErrorPermissions}
@@ -70,7 +70,7 @@ export function QRCodeScanner(props: QRCodeScannerProps) {
             <View style={[styles.errorContainer, props.containerStyle]}>
                 <UILabel
                     role={UILabelRoles.TitleMedium}
-                    color={UILabelColors.TextPrimaryInverted}
+                    color={UILabelColors.TextInverted}
                     style={styles.errorText}
                 >
                     {uiLocalized.QRCodeScanner.ErrorUnexpected}
diff --git a/casts/rows/src/UIListRowsAdapter.tsx b/casts/rows/src/UIListRowsAdapter.tsx
index a62ce5bd7..0edb6ad92 100644
--- a/casts/rows/src/UIListRowsAdapter.tsx
+++ b/casts/rows/src/UIListRowsAdapter.tsx
@@ -46,7 +46,7 @@ export const UIListSeparator = React.memo(function UIListSeparator() {
         <View
             style={[
                 {
-                    borderTopColor: theme[ColorVariants.LineOverlayLight],
+                    borderTopColor: theme[ColorVariants.BackgroundTertiary],
                 },
                 styles.separator,
             ]}
diff --git a/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx b/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx
index 4c424aae6..d6eb2118b 100644
--- a/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx
+++ b/casts/splitNavigator/src/SplitNavigator/MainAnimatedIcon.tsx
@@ -30,9 +30,7 @@ function MainAnimatedIconInner({
     const smallCircleRadius = (cx + 1) / 2;
     const smallCircleRadiusWithStroke = smallCircleRadius - STROKE_SIZE / 2;
     const { colorParts: bgColorParts } = useColorParts(ColorVariants.BackgroundAccent);
-    const { colorParts: borderColorParts } = useColorParts(
-        ColorVariants.BackgroundTertiaryInverted,
-    );
+    const { colorParts: borderColorParts } = useColorParts(ColorVariants.BackgroundTertiary);
     const circle2Props = useAnimatedProps(() => {
         return {
             r: interpolate(
diff --git a/kit/controls/src/Button/Button.tsx b/kit/controls/src/Button/Button.tsx
index 43dc4f259..f0e42c972 100644
--- a/kit/controls/src/Button/Button.tsx
+++ b/kit/controls/src/Button/Button.tsx
@@ -82,7 +82,7 @@ const ButtonForward = React.forwardRef<TouchableWithoutFeedback, ButtonProps>(
                 <View style={Platform.OS === 'web' ? styles.content : null}>
                     {loading ? (
                         <UIIndicator
-                            color={ColorVariants.LineNeutral}
+                            color={ColorVariants.BackgroundInverted}
                             size={UIConstant.loaderSize}
                         />
                     ) : (
diff --git a/kit/controls/src/Button/useButtonChildren.tsx b/kit/controls/src/Button/useButtonChildren.tsx
index 38d816c0c..16ada6ad2 100644
--- a/kit/controls/src/Button/useButtonChildren.tsx
+++ b/kit/controls/src/Button/useButtonChildren.tsx
@@ -110,7 +110,7 @@ export function ButtonIcon({
 
 export function ButtonTitle({
     children,
-    titleColor = UILabelColors.TextPrimaryInverted,
+    titleColor = UILabelColors.TextInverted,
     titleRole = UILabelRoles.Action,
     titleAnimStyle,
     numberOfLines = 1,
diff --git a/kit/controls/src/UIBoxButton/constants.ts b/kit/controls/src/UIBoxButton/constants.ts
index 45a98b12d..2c0016f48 100644
--- a/kit/controls/src/UIBoxButton/constants.ts
+++ b/kit/controls/src/UIBoxButton/constants.ts
@@ -24,14 +24,14 @@ const PrimaryContent: PressableColors = {
     initialColor: ColorVariants.StaticTextPrimaryLight,
     pressedColor: ColorVariants.StaticTextPrimaryLight,
     hoveredColor: ColorVariants.StaticTextPrimaryLight,
-    disabledColor: ColorVariants.TextOverlayInverted,
+    disabledColor: ColorVariants.TextTertiary,
     loadingColor: ColorVariants.StaticTextPrimaryLight,
 };
 const SecondaryBackground: PressableColors = {
     initialColor: ColorVariants.BackgroundSecondary,
     pressedColor: ColorVariants.BackgroundTertiary,
     hoveredColor: ColorVariants.BackgroundTertiary,
-    disabledColor: ColorVariants.TextOverlayInverted,
+    disabledColor: ColorVariants.TextTertiary,
     loadingColor: ColorVariants.BackgroundTertiary,
 };
 const TransparentBackground: PressableColors = {
@@ -93,7 +93,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPrimary,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPrimary,
             },
         },
@@ -103,7 +103,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextNegative,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextNegative,
             },
         },
@@ -113,7 +113,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPositive,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPositive,
             },
         },
@@ -125,7 +125,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextAccent,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextAccent,
             },
         },
@@ -135,7 +135,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextNegative,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextNegative,
             },
         },
@@ -145,7 +145,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPositive,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPositive,
             },
         },
@@ -157,7 +157,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPrimary,
                 pressedColor: ColorVariants.TextAccent,
                 hoveredColor: ColorVariants.TextAccent,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPrimary,
             },
         },
@@ -167,7 +167,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextNegative,
                 pressedColor: ColorVariants.TextAccent,
                 hoveredColor: ColorVariants.TextAccent,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextNegative,
             },
         },
@@ -177,7 +177,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPositive,
                 pressedColor: ColorVariants.TextAccent,
                 hoveredColor: ColorVariants.TextAccent,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPositive,
             },
         },
diff --git a/kit/controls/src/UIIndicator.tsx b/kit/controls/src/UIIndicator.tsx
index 1db888676..4cfb893d5 100644
--- a/kit/controls/src/UIIndicator.tsx
+++ b/kit/controls/src/UIIndicator.tsx
@@ -37,7 +37,7 @@ export const AnimatedCircle = Animated.createAnimatedComponent(
 );
 
 export const UIIndicator = React.memo(function UIIndicator({
-    color = ColorVariants.LineAccent,
+    color = ColorVariants.BackgroundAccent,
     size = UIConstant.indicator.defaultSize,
     trackWidth = UIConstant.indicator.defaultTrackWidth,
     style,
diff --git a/kit/controls/src/UILinkButton/constants.ts b/kit/controls/src/UILinkButton/constants.ts
index f1c25fd6d..477fd6ecf 100644
--- a/kit/controls/src/UILinkButton/constants.ts
+++ b/kit/controls/src/UILinkButton/constants.ts
@@ -33,7 +33,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextAccent,
                 pressedColor: ColorVariants.SpecialAccentDark,
                 hoveredColor: ColorVariants.SpecialAccentLight,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextAccent,
             },
         },
@@ -42,7 +42,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextNegative,
                 pressedColor: ColorVariants.SpecialAccentDark,
                 hoveredColor: ColorVariants.SpecialAccentLight,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextNegative,
             },
         },
@@ -51,7 +51,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPositive,
                 pressedColor: ColorVariants.SpecialAccentDark,
                 hoveredColor: ColorVariants.SpecialAccentLight,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPositive,
             },
         },
@@ -62,7 +62,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPrimary,
                 pressedColor: ColorVariants.SpecialAccentDark,
                 hoveredColor: ColorVariants.SpecialAccentLight,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPrimary,
             },
         },
@@ -71,7 +71,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextNegative,
                 pressedColor: ColorVariants.SpecialAccentDark,
                 hoveredColor: ColorVariants.SpecialAccentLight,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextNegative,
             },
         },
@@ -80,7 +80,7 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPositive,
                 pressedColor: ColorVariants.SpecialAccentDark,
                 hoveredColor: ColorVariants.SpecialAccentLight,
-                disabledColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
                 loadingColor: ColorVariants.TextPositive,
             },
         },
diff --git a/kit/controls/src/UILoadMoreButton.tsx b/kit/controls/src/UILoadMoreButton.tsx
index 87d04806f..99a84ce8f 100644
--- a/kit/controls/src/UILoadMoreButton.tsx
+++ b/kit/controls/src/UILoadMoreButton.tsx
@@ -54,7 +54,7 @@ export const UILoadMoreButton: React.FunctionComponent<Props> = ({
                 )}
                 {isLoadingMore && (
                     <UIIndicator
-                        color={ColorVariants.LinePrimary}
+                        color={ColorVariants.BackgroundPrimary}
                         size={20}
                         style={styles.indicator}
                     />
diff --git a/kit/controls/src/UIMsgButton/constants.ts b/kit/controls/src/UIMsgButton/constants.ts
index 3c1513407..cae221fd8 100644
--- a/kit/controls/src/UIMsgButton/constants.ts
+++ b/kit/controls/src/UIMsgButton/constants.ts
@@ -29,7 +29,7 @@ const PrimaryContent: PressableColors = {
     initialColor: ColorVariants.StaticTextPrimaryLight,
     pressedColor: ColorVariants.StaticTextPrimaryLight,
     hoveredColor: ColorVariants.StaticTextPrimaryLight,
-    disabledColor: ColorVariants.TextOverlayInverted,
+    disabledColor: ColorVariants.TextTertiary,
     loadingColor: ColorVariants.StaticTextPrimaryLight,
 };
 const TransparentColors: PressableColors = {
@@ -94,15 +94,15 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextAccent,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
-                loadingColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
+                loadingColor: ColorVariants.TextSecondary,
             },
             border: {
-                initialColor: ColorVariants.LineAccent,
-                pressedColor: ColorVariants.LineNeutral,
-                hoveredColor: ColorVariants.LineNeutral,
-                disabledColor: ColorVariants.LineTertiary,
-                loadingColor: ColorVariants.LineTertiary,
+                initialColor: ColorVariants.BackgroundAccent,
+                pressedColor: ColorVariants.BackgroundInverted,
+                hoveredColor: ColorVariants.BackgroundInverted,
+                disabledColor: ColorVariants.BackgroundTertiary,
+                loadingColor: ColorVariants.BackgroundTertiary,
             },
         },
         [UIMsgButtonVariant.Negative]: {
@@ -111,15 +111,15 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextNegative,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
-                loadingColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
+                loadingColor: ColorVariants.TextSecondary,
             },
             border: {
-                initialColor: ColorVariants.LineNegative,
-                pressedColor: ColorVariants.LineNeutral,
-                hoveredColor: ColorVariants.LineNeutral,
-                disabledColor: ColorVariants.LineTertiary,
-                loadingColor: ColorVariants.LineTertiary,
+                initialColor: ColorVariants.BackgroundNegative,
+                pressedColor: ColorVariants.BackgroundInverted,
+                hoveredColor: ColorVariants.BackgroundInverted,
+                disabledColor: ColorVariants.BackgroundTertiary,
+                loadingColor: ColorVariants.BackgroundTertiary,
             },
         },
         [UIMsgButtonVariant.Positive]: {
@@ -128,15 +128,15 @@ export const ContentColors: Record<
                 initialColor: ColorVariants.TextPositive,
                 pressedColor: ColorVariants.TextPrimary,
                 hoveredColor: ColorVariants.TextPrimary,
-                disabledColor: ColorVariants.TextOverlay,
-                loadingColor: ColorVariants.TextOverlay,
+                disabledColor: ColorVariants.TextSecondary,
+                loadingColor: ColorVariants.TextSecondary,
             },
             border: {
-                initialColor: ColorVariants.LinePositive,
-                pressedColor: ColorVariants.LineNeutral,
-                hoveredColor: ColorVariants.LineNeutral,
-                disabledColor: ColorVariants.LineTertiary,
-                loadingColor: ColorVariants.LineTertiary,
+                initialColor: ColorVariants.BackgroundPositive,
+                pressedColor: ColorVariants.BackgroundInverted,
+                hoveredColor: ColorVariants.BackgroundInverted,
+                disabledColor: ColorVariants.BackgroundTertiary,
+                loadingColor: ColorVariants.BackgroundTertiary,
             },
         },
     },
diff --git a/kit/controls/src/UIPillButton/constants.ts b/kit/controls/src/UIPillButton/constants.ts
index 90e6d84ca..2558dc32f 100644
--- a/kit/controls/src/UIPillButton/constants.ts
+++ b/kit/controls/src/UIPillButton/constants.ts
@@ -36,7 +36,7 @@ export const ContentColors: Record<
             initialColor: ColorVariants.StaticTextPrimaryLight,
             pressedColor: ColorVariants.StaticTextPrimaryLight,
             hoveredColor: ColorVariants.StaticTextPrimaryLight,
-            disabledColor: ColorVariants.TextOverlayInverted,
+            disabledColor: ColorVariants.TextTertiary,
             loadingColor: ColorVariants.StaticTextPrimaryLight,
         },
     },
@@ -52,7 +52,7 @@ export const ContentColors: Record<
             initialColor: ColorVariants.StaticTextPrimaryLight,
             pressedColor: ColorVariants.StaticTextPrimaryLight,
             hoveredColor: ColorVariants.StaticTextPrimaryLight,
-            disabledColor: ColorVariants.TextOverlayInverted,
+            disabledColor: ColorVariants.TextTertiary,
             loadingColor: ColorVariants.StaticTextPrimaryLight,
         },
     },
@@ -68,7 +68,7 @@ export const ContentColors: Record<
             initialColor: ColorVariants.StaticTextPrimaryLight,
             pressedColor: ColorVariants.StaticTextPrimaryLight,
             hoveredColor: ColorVariants.StaticTextPrimaryLight,
-            disabledColor: ColorVariants.TextOverlayInverted,
+            disabledColor: ColorVariants.TextTertiary,
             loadingColor: ColorVariants.StaticTextPrimaryLight,
         },
     },
diff --git a/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx b/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx
index b812b962b..248381e2e 100644
--- a/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx
+++ b/kit/controls/src/UISwitcher/IconSwitcher/hooks.tsx
@@ -128,9 +128,9 @@ export const useImageStyle = (
                 switcherState.value,
                 [SwitcherState.Active, SwitcherState.Hovered, SwitcherState.Pressed],
                 [
-                    theme[ColorVariants.BackgroundTertiaryInverted] as string,
-                    theme[ColorVariants.LineNeutral] as string,
-                    theme[ColorVariants.LineNeutral] as string,
+                    theme[ColorVariants.BackgroundTertiary] as string,
+                    theme[ColorVariants.BackgroundInverted] as string,
+                    theme[ColorVariants.BackgroundInverted] as string,
                 ],
             ),
         };
diff --git a/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx b/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx
index 1d954cdde..cfc5a05b3 100644
--- a/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx
+++ b/kit/controls/src/UISwitcher/ToggleSwitcher/hooks.tsx
@@ -100,7 +100,7 @@ export const useImageStyle = (
                 animatedValue.value,
                 [IconSwitcherState.NotActive, IconSwitcherState.Active],
                 [
-                    theme[ColorVariants.BackgroundTertiaryInverted] as string,
+                    theme[ColorVariants.BackgroundTertiary] as string,
                     theme[ColorVariants.BackgroundAccent] as string,
                 ],
             ),
diff --git a/kit/controls/src/UIWideBoxButton/constants.ts b/kit/controls/src/UIWideBoxButton/constants.ts
index 379c8649b..62c448d42 100644
--- a/kit/controls/src/UIWideBoxButton/constants.ts
+++ b/kit/controls/src/UIWideBoxButton/constants.ts
@@ -22,21 +22,21 @@ export const contentColors: Record<
         initialColor: ColorVariants.StaticTextPrimaryLight,
         pressedColor: ColorVariants.StaticTextPrimaryLight,
         hoveredColor: ColorVariants.StaticTextPrimaryLight,
-        disabledColor: ColorVariants.TextOverlayInverted,
-        loadingColor: ColorVariants.TextOverlayInverted,
+        disabledColor: ColorVariants.TextTertiary,
+        loadingColor: ColorVariants.TextTertiary,
     },
     secondary: {
         initialColor: ColorVariants.BackgroundAccent,
         pressedColor: ColorVariants.SpecialAccentDark,
         hoveredColor: ColorVariants.SpecialAccentLight,
-        disabledColor: ColorVariants.TextOverlay,
-        loadingColor: ColorVariants.TextOverlay,
+        disabledColor: ColorVariants.TextSecondary,
+        loadingColor: ColorVariants.TextSecondary,
     },
     nulled: {
         initialColor: ColorVariants.TextPrimary,
         pressedColor: ColorVariants.TextAccent,
         hoveredColor: ColorVariants.SpecialAccentLight,
-        disabledColor: ColorVariants.TextOverlay,
-        loadingColor: ColorVariants.TextOverlay,
+        disabledColor: ColorVariants.TextSecondary,
+        loadingColor: ColorVariants.TextSecondary,
     },
 };
diff --git a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx
index f66a6c43e..487353574 100644
--- a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx
+++ b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonNulled.tsx
@@ -25,7 +25,7 @@ function RightContent({
     });
 
     if (loading) {
-        return <UIIndicator color={ColorVariants.TextOverlay} size={UILayoutConstant.iconSize} />;
+        return <UIIndicator color={ColorVariants.TextSecondary} size={UILayoutConstant.iconSize} />;
     }
     if (icon) {
         return (
diff --git a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx
index 98a803992..ac317b2df 100644
--- a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx
+++ b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonPrimary.tsx
@@ -23,12 +23,7 @@ function RightContent({
     });
 
     if (loading) {
-        return (
-            <UIIndicator
-                color={ColorVariants.TextOverlayInverted}
-                size={UILayoutConstant.iconSize}
-            />
-        );
+        return <UIIndicator color={ColorVariants.TextTertiary} size={UILayoutConstant.iconSize} />;
     }
     if (icon) {
         return (
diff --git a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx
index cb9649678..bdbda494f 100644
--- a/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx
+++ b/kit/controls/src/UIWideBoxButton/content/UIWideBoxButtonSecondary.tsx
@@ -23,7 +23,7 @@ function RightContent({
     });
 
     if (loading) {
-        return <UIIndicator color={ColorVariants.TextOverlay} size={UILayoutConstant.iconSize} />;
+        return <UIIndicator color={ColorVariants.TextSecondary} size={UILayoutConstant.iconSize} />;
     }
     if (icon) {
         return (
diff --git a/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx b/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx
index 0c2d31e2a..223b74b8f 100644
--- a/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx
+++ b/kit/inputs/src/MaterialTextView/MaterialTextViewChildren.tsx
@@ -75,7 +75,7 @@ export const MaterialTextViewClearButton = React.memo(function MaterialTextViewC
         <TouchableOpacity testID="clear_btn" style={styles.iconTapZone} onPress={clear}>
             <UIImage
                 source={UIAssets.icons.ui.clear}
-                tintColor={ColorVariants.BackgroundPrimaryInverted}
+                tintColor={ColorVariants.BackgroundInverted}
                 style={styles.iconSize}
             />
         </TouchableOpacity>
diff --git a/kit/media/src/UILightbox/Footer.tsx b/kit/media/src/UILightbox/Footer.tsx
index de2c0db75..3528762cc 100644
--- a/kit/media/src/UILightbox/Footer.tsx
+++ b/kit/media/src/UILightbox/Footer.tsx
@@ -45,10 +45,7 @@ export const Footer = ({ prompt, visibilityState }: FooterProps) => {
     return (
         <Animated.View style={[styles.footerContainer, footerStyle]} pointerEvents="box-none">
             <Animated.View style={styles.footer} pointerEvents="none">
-                <UILabel
-                    role={UILabelRoles.ParagraphText}
-                    color={ColorVariants.TextPrimaryInverted}
-                >
+                <UILabel role={UILabelRoles.ParagraphText} color={ColorVariants.TextInverted}>
                     {prompt}
                 </UILabel>
             </Animated.View>
diff --git a/kit/media/src/UIQRCodeView/QRCodeCircle.tsx b/kit/media/src/UIQRCodeView/QRCodeCircle.tsx
index 31cd9ad70..eb672657e 100644
--- a/kit/media/src/UIQRCodeView/QRCodeCircle.tsx
+++ b/kit/media/src/UIQRCodeView/QRCodeCircle.tsx
@@ -152,16 +152,13 @@ export const QRCodeCircle: React.FC<QRCodeProps> = ({ value, logo, size }: QRCod
                 <View style={styles.outerQrCodeContainer}>
                     <Svg width={diameterOfCircleQRCode} height={diameterOfCircleQRCode}>
                         <Path
-                            fill={theme[ColorVariants.BackgroundPrimaryInverted] as string}
+                            fill={theme[ColorVariants.BackgroundInverted] as string}
                             d={qrSvgOuter}
                         />
                     </Svg>
                 </View>
                 <Svg width={sizeOfInnerQRCode} height={sizeOfInnerQRCode}>
-                    <Path
-                        fill={theme[ColorVariants.BackgroundPrimaryInverted] as string}
-                        d={qrSvg}
-                    />
+                    <Path fill={theme[ColorVariants.BackgroundInverted] as string} d={qrSvg} />
                 </Svg>
             </View>
             {logoRender}
diff --git a/kit/media/src/UIQRCodeView/QRCodeSquare.tsx b/kit/media/src/UIQRCodeView/QRCodeSquare.tsx
index 8d357415a..470817cea 100644
--- a/kit/media/src/UIQRCodeView/QRCodeSquare.tsx
+++ b/kit/media/src/UIQRCodeView/QRCodeSquare.tsx
@@ -50,10 +50,7 @@ export const QRCodeSquare = ({ value, logo, size }: QRCodeProps) => {
         <View style={styles.container}>
             <View style={styles.qrContainer}>
                 <Svg width={qrCodeSize} height={qrCodeSize}>
-                    <Path
-                        fill={theme[ColorVariants.BackgroundPrimaryInverted] as string}
-                        d={qrSvg}
-                    />
+                    <Path fill={theme[ColorVariants.BackgroundInverted] as string} d={qrSvg} />
                 </Svg>
             </View>
             {logoRender}
diff --git a/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx b/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx
index 5111ec974..d8667374a 100644
--- a/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx
+++ b/kit/media/src/UIQRCodeView/hooks/useLogoRender.tsx
@@ -23,7 +23,7 @@ export const useLogoRender = (
             <UIImage
                 source={logo}
                 style={logoStyles.image as ImageStyle}
-                tintColor={ColorVariants.BackgroundPrimaryInverted}
+                tintColor={ColorVariants.BackgroundInverted}
             />
         );
     }
diff --git a/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx b/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx
index 053a32a37..c806f3679 100644
--- a/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx
+++ b/kit/popups/src/UIPushNotice/UIPushNoticeContent.tsx
@@ -89,7 +89,7 @@ function LineCountdown({
 const useStyles = makeStyles((theme: Theme) => ({
     countdownLine: {
         flex: 1,
-        backgroundColor: theme[UIBackgroundViewColors.BackgroundPrimaryInverted],
+        backgroundColor: theme[UIBackgroundViewColors.BackgroundInverted],
     },
 }));
 
diff --git a/kit/themes/src/Colors.ts b/kit/themes/src/Colors.ts
index d0accd97d..bd4cdef39 100644
--- a/kit/themes/src/Colors.ts
+++ b/kit/themes/src/Colors.ts
@@ -2,19 +2,6 @@ import * as React from 'react';
 
 import type { ColorValue } from 'react-native';
 
-function getThemeWithWarning<T extends ColorVariants>(theme: Record<T, string>): Record<T, string> {
-    return Object.entries<string>(theme).reduce<Record<string, string>>((result, record) => {
-        const key = record[0] as T;
-        return {
-            ...result,
-            get [key]() {
-                console.warn(`You have a deprecated color: ${key} in your color scheme`);
-                return record[1];
-            },
-        };
-    }, {});
-}
-
 export enum ColorVariants {
     TextBW = 'TextBW',
     TextPrimary = 'TextPrimary',
@@ -37,6 +24,7 @@ export enum ColorVariants {
     BackgroundPositive = 'BackgroundPositive',
     BackgroundWarning = 'BackgroundWarning',
     BackgroundNulled = 'BackgroundNulled',
+    BackgroundOverlay = 'BackgroundOverlay',
 
     GraphBW = 'GraphBW',
     GraphPrimary = 'GraphPrimary',
@@ -105,6 +93,7 @@ export enum ColorVariants {
     Transparent = 'Transparent',
     KeyboardStyle = 'KeyboardStyle',
 
+    /** Legacy colors */
     StaticTextPrimaryDark = 'StaticTextPrimaryDark',
     StaticTextPrimaryLight = 'StaticTextPrimaryLight',
     StaticTextOverlayDark = 'StaticTextOverlayDark',
@@ -120,34 +109,6 @@ export enum ColorVariants {
     StaticBackgroundNegative = 'StaticBackgroundNegative',
     StaticBackgroundPositive = 'StaticBackgroundPositive',
     StaticBackgroundOverlay = 'StaticBackgroundOverlay',
-
-    /** Depracated colors */
-    TextNeutral = 'TextNeutral',
-    TextPrimaryInverted = 'TextPrimaryInverted',
-    TextOverlay = 'TextOverlay',
-    TextOverlayInverted = 'TextOverlayInverted',
-    BackgroundNeutral = 'BackgroundNeutral',
-    BackgroundPrimaryInverted = 'BackgroundPrimaryInverted',
-    BackgroundSecondaryInverted = 'BackgroundSecondaryInverted',
-    BackgroundTertiaryInverted = 'BackgroundTertiaryInverted',
-    BackgroundOverlay = 'BackgroundOverlay',
-    BackgroundOverlayInverted = 'BackgroundOverlayInverted',
-    BackgroundOverlayDark = 'BackgroundOverlayDark',
-    BackgroundOverlayLight = 'BackgroundOverlayLight',
-    GraphPrimaryInverted = 'GraphPrimaryInverted',
-    GraphNeutral = 'GraphNeutral',
-    IconAccent = 'IconAccent',
-    IconSecondary = 'IconSecondary',
-    IconNeutral = 'IconNeutral',
-    LinePrimary = 'LinePrimary',
-    LineSecondary = 'LineSecondary',
-    LineTertiary = 'LineTertiary',
-    LineNeutral = 'LineNeutral',
-    LineAccent = 'LineAccent',
-    LineNegative = 'LineNegative',
-    LineOverlayLight = 'LineOverlayLight',
-    LineOverlayDark = 'LineOverlayDark',
-    LinePositive = 'LinePositive',
 }
 
 export type Theme = {
@@ -215,38 +176,8 @@ const StaticTheme = {
     [ColorVariants.StaticBackgroundOverlay]: 'rgba(4, 4, 4, 0.4)',
 };
 
-export const LightThemeDeprecated = {
-    [ColorVariants.TextPrimaryInverted]: '#EFEFF0', // TextInverted
-    [ColorVariants.TextNeutral]: '#3B4043',
-    [ColorVariants.TextOverlay]: 'rgba(28, 33, 36, 0.4)', // TextPrimary 40%
-    [ColorVariants.TextOverlayInverted]: 'rgba(239, 239, 240, 0.6)', // TextInverted 60%
-    [ColorVariants.BackgroundPrimaryInverted]: '#1C2124', // BackgroundInverted
-    [ColorVariants.BackgroundSecondaryInverted]: '#283035',
-    [ColorVariants.BackgroundTertiaryInverted]: '#3B474E',
-    [ColorVariants.BackgroundNeutral]: '#3B4043',
-    [ColorVariants.BackgroundOverlay]: 'rgba(4, 4, 4, 0.4)', // BackgroundPrimary 40%
-    [ColorVariants.BackgroundOverlayInverted]: 'rgba(239, 239, 240, 0.4)', // BackgroundPrimary 40%
-    [ColorVariants.BackgroundOverlayDark]: 'rgba(0, 0, 0, 0.12)', // #000000 12%
-    [ColorVariants.BackgroundOverlayLight]: 'rgba(255, 255, 255, 0.08)', // #FFFFFF 8%
-    [ColorVariants.GraphPrimaryInverted]: '#EFEFF0', // GraphInverted
-    [ColorVariants.GraphNeutral]: '#3B4043',
-    [ColorVariants.LinePrimary]: '#EFEFF0', // GraphInverted
-    [ColorVariants.LineSecondary]: '#EFEFF0', // GraphInverted
-    [ColorVariants.LineTertiary]: '#EFEFF0', // GraphInverted
-    [ColorVariants.LineNeutral]: '#3B4043', // GraphNeutral
-    [ColorVariants.LineAccent]: '#4963E6', // GraphAccent
-    [ColorVariants.LineNegative]: '#FF0C0C', // GraphNegative
-    [ColorVariants.LinePositive]: '#00D359', // GraphPositive
-    [ColorVariants.LineOverlayDark]: 'rgba(255, 255, 255, 0.08)', // #FFFFFF 8%
-    [ColorVariants.LineOverlayLight]: 'rgba(0, 0, 0, 0.04)', // #000000 4%
-    [ColorVariants.IconAccent]: '#0073C4',
-    [ColorVariants.IconSecondary]: '#707376',
-    [ColorVariants.IconNeutral]: '#E2E3E4',
-};
-
 export const LightTheme: Theme = {
     ...StaticTheme,
-    ...getThemeWithWarning(LightThemeDeprecated),
     [ColorVariants.TextBW]: '#191E21',
     [ColorVariants.TextPrimary]: '#1C2124',
     [ColorVariants.TextSecondary]: '#657782',
@@ -268,6 +199,7 @@ export const LightTheme: Theme = {
     [ColorVariants.BackgroundPositive]: '#00D359',
     [ColorVariants.BackgroundWarning]: '#FFB608',
     [ColorVariants.BackgroundNulled]: 'rgba(255, 255, 255, 0)', // #FFFFFF 0%
+    [ColorVariants.BackgroundOverlay]: 'rgba(0, 0, 0, 0.4)', // #000000 40%
 
     [ColorVariants.GraphBW]: '#191E21',
     [ColorVariants.GraphPrimary]: '#1C2124',
@@ -292,38 +224,8 @@ export const LightTheme: Theme = {
     [ColorVariants.ShadowOpaque]: 'rgba(32, 38, 42, 0.08)',
 };
 
-export const DarkThemeDeprecated = {
-    [ColorVariants.TextPrimaryInverted]: '#1C2124', // TextInverted
-    [ColorVariants.TextNeutral]: '#3B4043',
-    [ColorVariants.TextOverlay]: 'rgba(239, 239, 240, 0.4)', // TextPrimary 40%
-    [ColorVariants.TextOverlayInverted]: 'rgba(4, 4, 4, 0.6)', // #040404 60%
-    [ColorVariants.BackgroundPrimaryInverted]: '#EFEFF0', // BackgroundInverted
-    [ColorVariants.BackgroundSecondaryInverted]: '#E8E9E9',
-    [ColorVariants.BackgroundTertiaryInverted]: '#494D51',
-    [ColorVariants.BackgroundNeutral]: '#3B4043',
-    [ColorVariants.BackgroundOverlay]: 'rgba(4, 4, 4, 0.6)', // #040404 60%
-    [ColorVariants.BackgroundOverlayInverted]: 'rgba(239, 239, 240, 0.2)', // BackgroundInverted 20%
-    [ColorVariants.BackgroundOverlayDark]: 'rgba(0, 0, 0, 0.08)', // #000000 8%
-    [ColorVariants.BackgroundOverlayLight]: 'rgba(255, 255, 255, 0.04)', // #FFFFFF 4%
-    [ColorVariants.GraphPrimaryInverted]: '#1C2124', // GraphInverted
-    [ColorVariants.GraphNeutral]: '#3B4043',
-    [ColorVariants.LinePrimary]: '#1C2124', // GraphInverted
-    [ColorVariants.LineSecondary]: '#1C2124', // GraphInverted
-    [ColorVariants.LineTertiary]: '#1C2124', // GraphInverted
-    [ColorVariants.LineNeutral]: '#3B4043', // GraphNeutral
-    [ColorVariants.LineAccent]: '#4963E6', // GraphAccent
-    [ColorVariants.LineNegative]: '#FF4747', // GraphNegative
-    [ColorVariants.LinePositive]: '#26DA72', // GraphPositive
-    [ColorVariants.LineOverlayDark]: 'rgba(0, 0, 0, 0.08)', // #000000 8%
-    [ColorVariants.LineOverlayLight]: 'rgba(255, 255, 255, 0.08)', // #FFFFFF 8%
-    [ColorVariants.IconAccent]: '#0073C4',
-    [ColorVariants.IconSecondary]: '#E8E9E9',
-    [ColorVariants.IconNeutral]: '#3B4043',
-};
-
 export const DarkTheme: Theme = {
     ...StaticTheme,
-    ...getThemeWithWarning(DarkThemeDeprecated),
     [ColorVariants.TextBW]: '#FFFFFF',
     [ColorVariants.TextPrimary]: '#EFEFF0',
     [ColorVariants.TextSecondary]: '#A4A6A8',
@@ -345,6 +247,7 @@ export const DarkTheme: Theme = {
     [ColorVariants.BackgroundPositive]: '#26DA72',
     [ColorVariants.BackgroundWarning]: '#FFCA00',
     [ColorVariants.BackgroundNulled]: 'rgba(0, 0, 0, 0)', // #000000 0%
+    [ColorVariants.BackgroundOverlay]: 'rgba(0, 0, 0, 0.6)', // #000000 60%
 
     [ColorVariants.GraphBW]: '#FFFFFF',
     [ColorVariants.GraphPrimary]: '#EFEFF0',
diff --git a/kit/themes/src/ColorsLegacy.ts b/kit/themes/src/ColorsLegacy.ts
deleted file mode 100644
index bc9388410..000000000
--- a/kit/themes/src/ColorsLegacy.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { ColorVariants, DarkTheme, LightTheme, Theme } from './Colors';
-
-const StaticThemeLegacy = {
-    [ColorVariants.StaticTextPrimaryDark]: '#20262A',
-    [ColorVariants.StaticTextPrimaryLight]: '#FDFDFD',
-    [ColorVariants.StaticTextOverlayDark]: 'rgba(32, 38, 42, 0.6)',
-    [ColorVariants.StaticTextOverlayLight]: 'rgba(253, 253, 253, 0.6)',
-    [ColorVariants.StaticBackgroundBlack]: '#131719',
-    [ColorVariants.StaticBackgroundWhite]: '#FFFFFF',
-    [ColorVariants.StaticIconPrimaryDark]: '#20262A',
-    [ColorVariants.StaticIconPrimaryLight]: '#FDFDFD',
-    [ColorVariants.StaticHoverOverlay]: 'rgba(32, 38, 42, 0.2)',
-    [ColorVariants.StaticPressOverlay]: 'rgba(32, 38, 42, 0.4)',
-    [ColorVariants.StaticBlack]: '#000000',
-    [ColorVariants.StaticBackgroundAccent]: 'rgba(0, 131, 224, 0.12)',
-    [ColorVariants.StaticBackgroundNegative]: 'rgba(231, 23, 23, 0.12)',
-    [ColorVariants.StaticBackgroundPositive]: 'rgba(54, 192, 92, 0.12)',
-    [ColorVariants.StaticBackgroundOverlay]: 'rgba(4, 4, 4, 0.4)',
-};
-
-export const LightThemeLegacy: Theme = {
-    ...LightTheme,
-    ...StaticThemeLegacy,
-    [ColorVariants.TextPrimary]: '#20262A',
-    [ColorVariants.TextSecondary]: '#707376',
-    [ColorVariants.TextTertiary]: '#B6B8BA',
-    [ColorVariants.TextPrimaryInverted]: '#FAFAFA',
-    [ColorVariants.TextNeutral]: '#E2E3E4',
-    [ColorVariants.TextAccent]: '#0073C4',
-    [ColorVariants.TextNegative]: '#CA1414',
-    [ColorVariants.TextPositive]: '#2FA851',
-    [ColorVariants.TextWarning]: '#B08229',
-    [ColorVariants.TextOverlay]: 'rgba(32, 38, 42, 0.6)',
-    [ColorVariants.TextOverlayInverted]: 'rgba(250, 250, 250, 0.4)',
-
-    [ColorVariants.BackgroundPrimary]: '#FAFAFA',
-    [ColorVariants.BackgroundSecondary]: '#F4F4F5',
-    [ColorVariants.BackgroundTertiary]: '#EBECEC',
-    [ColorVariants.BackgroundNeutral]: '#E2E3E4',
-    [ColorVariants.BackgroundAccent]: '#0083E0',
-    [ColorVariants.BackgroundNegative]: '#E71717',
-    [ColorVariants.BackgroundPositive]: '#36C05C',
-    [ColorVariants.BackgroundWarning]: '#FFC043',
-    [ColorVariants.BackgroundPrimaryInverted]: '#20262A',
-    [ColorVariants.BackgroundTertiaryInverted]: '#B6B8BA',
-    [ColorVariants.BackgroundOverlay]: 'rgba(4, 4, 4, 0.4)',
-    [ColorVariants.BackgroundOverlayInverted]: 'rgba(255, 255, 255, 0.4)',
-    [ColorVariants.BackgroundBW]: '#FFFFFF',
-
-    [ColorVariants.LinePrimary]: '#F4F4F5',
-    [ColorVariants.LineSecondary]: '#EBECEC',
-    [ColorVariants.LineTertiary]: '#E2E3E4',
-    [ColorVariants.LineNeutral]: '#20262A',
-    [ColorVariants.LineAccent]: '#0083E0',
-    [ColorVariants.LineNegative]: '#CA1414',
-    [ColorVariants.LinePositive]: '#2FA851',
-    [ColorVariants.LineOverlayDark]: 'rgba(255,255,255,.08)',
-    [ColorVariants.LineOverlayLight]: 'rgba(0,0,0,.04)',
-
-    [ColorVariants.GraphAccent]: '#0073C4',
-    [ColorVariants.GraphPrimary]: '#20262A',
-    [ColorVariants.GraphSecondary]: '#707376',
-    [ColorVariants.GraphTertiary]: '#B6B8BA',
-    [ColorVariants.GraphPrimaryInverted]: '#FAFAFA',
-    [ColorVariants.GraphNeutral]: '#E2E3E4',
-    [ColorVariants.GraphNegative]: '#CA1414',
-
-    [ColorVariants.SpecialAccentLight]: '#339CE6',
-    [ColorVariants.SpecialAccentDark]: '#0069B3',
-
-    [ColorVariants.IconAccent]: '#0073C4',
-    // [ColorVariants.IconPrimary]: '#20262A',
-    [ColorVariants.IconSecondary]: '#707376',
-    // [ColorVariants.IconTertiary]: '#B6B8BA',
-    // [ColorVariants.IconPrimary]Inverted: '#FDFDFD',
-    [ColorVariants.IconNeutral]: '#E2E3E4',
-    // [ColorVariants.IconNegative]: '#CA1414',
-    [ColorVariants.Transparent]: 'rgba(0,0,0,0)',
-    [ColorVariants.KeyboardStyle]: 'light',
-
-    [ColorVariants.Shadow]: 'rgb(32, 38, 42)',
-    [ColorVariants.ShadowOpaque]: 'rgba(32, 38, 42, 0.08)',
-};
-
-export const DarkThemeLegacy: Theme = {
-    ...DarkTheme,
-    ...StaticThemeLegacy,
-    [ColorVariants.TextPrimary]: '#FAFAFA',
-    [ColorVariants.TextSecondary]: '#ADB0B1',
-    [ColorVariants.TextTertiary]: '#676B6E',
-    [ColorVariants.TextPrimaryInverted]: '#20262A',
-    [ColorVariants.TextNeutral]: '#3B4043',
-    [ColorVariants.TextAccent]: '#0083E0',
-    [ColorVariants.TextNegative]: '#E71717',
-    [ColorVariants.TextPositive]: '#36C05C',
-    [ColorVariants.TextWarning]: '#FFC043',
-    [ColorVariants.TextOverlay]: 'rgba(250, 250, 250, 0.4)',
-    [ColorVariants.TextOverlayInverted]: 'rgba(32, 38, 42, 0.6)',
-
-    [ColorVariants.BackgroundPrimary]: '#20262A',
-    [ColorVariants.BackgroundSecondary]: '#292F32',
-    [ColorVariants.BackgroundTertiary]: '#32373B',
-    [ColorVariants.BackgroundNeutral]: '#3B4043',
-    [ColorVariants.BackgroundAccent]: '#0073C4',
-    [ColorVariants.BackgroundNegative]: '#CA1414',
-    [ColorVariants.BackgroundPositive]: '#2FA851',
-    [ColorVariants.BackgroundWarning]: '#B08229',
-    [ColorVariants.BackgroundPrimaryInverted]: '#FAFAFA',
-    [ColorVariants.BackgroundTertiaryInverted]: '#676B6E',
-    [ColorVariants.BackgroundOverlay]: 'rgba(4, 4, 4, 0.6)',
-    [ColorVariants.BackgroundOverlayInverted]: 'rgba(255, 255, 255, 0.2)',
-    [ColorVariants.BackgroundBW]: '#1C2125',
-
-    [ColorVariants.LinePrimary]: '#292F32',
-    [ColorVariants.LineSecondary]: '#32373B',
-    [ColorVariants.LineTertiary]: '#32373B',
-    [ColorVariants.LineNeutral]: '#FAFAFA',
-    [ColorVariants.LineAccent]: '#0073C4',
-    [ColorVariants.LineNegative]: '#CA1414',
-    [ColorVariants.LinePositive]: '#36C05C',
-    [ColorVariants.LineOverlayDark]: 'rgba(0,0,0,.08)',
-    [ColorVariants.LineOverlayLight]: 'rgba(255,255,255,.08)',
-
-    [ColorVariants.GraphAccent]: '#0083E0',
-    [ColorVariants.GraphPrimary]: '#FAFAFA',
-    [ColorVariants.GraphSecondary]: '#ADB0B1',
-    [ColorVariants.GraphTertiary]: '#676B6E',
-    [ColorVariants.GraphPrimaryInverted]: '#20262A',
-    [ColorVariants.GraphNeutral]: '#3B4043',
-    [ColorVariants.GraphNegative]: '#E71717',
-
-    [ColorVariants.SpecialAccentLight]: '#338FD0',
-    [ColorVariants.SpecialAccentDark]: '#005C9D',
-
-    [ColorVariants.IconAccent]: '#0073C4',
-    [ColorVariants.IconSecondary]: '#ADB0B1',
-    [ColorVariants.IconNeutral]: '#3B4043',
-
-    [ColorVariants.Transparent]: 'rgba(0,0,0,0)',
-    [ColorVariants.KeyboardStyle]: 'dark',
-
-    [ColorVariants.Shadow]: 'rgb(19, 23, 25)',
-    [ColorVariants.ShadowOpaque]: 'rgba(19, 23, 25, 0.4)',
-};
diff --git a/kit/themes/src/index.ts b/kit/themes/src/index.ts
index f6820b036..176c88cee 100644
--- a/kit/themes/src/index.ts
+++ b/kit/themes/src/index.ts
@@ -14,7 +14,6 @@ import * as useShadow from './useShadow';
 
 export * from './AnimateableText';
 export * from './Colors';
-export * from './ColorsLegacy';
 export * from './Typography';
 export * from './UIBackgroundView';
 export * from './UILabel';
diff --git a/stories/browser/src/ActionButton.tsx b/stories/browser/src/ActionButton.tsx
index 6cb5afb78..db947b718 100644
--- a/stories/browser/src/ActionButton.tsx
+++ b/stories/browser/src/ActionButton.tsx
@@ -34,7 +34,7 @@ export function ActionButton({ inputHasValue, hasError, onPress, clear }: Action
                     <UIImage
                         source={UIAssets.icons.ui.closeRemove}
                         style={actionStyles.iconClear}
-                        tintColor={ColorVariants.LinePrimary}
+                        tintColor={ColorVariants.BackgroundPrimary}
                     />
                 </View>
             </TouchableOpacity>
diff --git a/stories/browser/src/BubbleConfirm.tsx b/stories/browser/src/BubbleConfirm.tsx
index f28b84cb2..493bb12d1 100644
--- a/stories/browser/src/BubbleConfirm.tsx
+++ b/stories/browser/src/BubbleConfirm.tsx
@@ -50,7 +50,7 @@ export function BubbleConfirmButtons({
                     styles.button,
                     {
                         marginRight: UIConstant.tinyContentOffset(),
-                        borderColor: theme[ColorVariants.LinePositive],
+                        borderColor: theme[ColorVariants.BackgroundPositive],
                     },
                 ]}
                 onPress={onSuccess}
@@ -68,7 +68,7 @@ export function BubbleConfirmButtons({
                 style={[
                     styles.button,
                     {
-                        borderColor: theme[ColorVariants.LineNegative],
+                        borderColor: theme[ColorVariants.BackgroundNegative],
                     },
                 ]}
                 onPress={onDecline}
diff --git a/stories/browser/src/Inputs/TransactionConfirmation.tsx b/stories/browser/src/Inputs/TransactionConfirmation.tsx
index 88276b517..5e61711cf 100644
--- a/stories/browser/src/Inputs/TransactionConfirmation.tsx
+++ b/stories/browser/src/Inputs/TransactionConfirmation.tsx
@@ -71,7 +71,7 @@ export function TransactionConfirmation({
                             styles.button,
                             styles.response,
                             {
-                                borderColor: theme[ColorVariants.LineAccent],
+                                borderColor: theme[ColorVariants.BackgroundAccent],
                             },
                         ]}
                     >
diff --git a/stories/browser/src/UIBoxPicker.tsx b/stories/browser/src/UIBoxPicker.tsx
index 6cef8c54d..8dca195bb 100644
--- a/stories/browser/src/UIBoxPicker.tsx
+++ b/stories/browser/src/UIBoxPicker.tsx
@@ -52,7 +52,7 @@ function UIBoxPickerItem<Box extends AbstractBox>({
                     </UILabel>
                     <UIImage
                         source={UIAssets.icons.ui.keyThin}
-                        tintColor={ColorVariants.IconSecondary}
+                        tintColor={ColorVariants.TextSecondary}
                         style={styles.itemKey}
                     />
                 </>
diff --git a/stories/chats/src/BubblePlainText.tsx b/stories/chats/src/BubblePlainText.tsx
index 8b9fe5467..35f289215 100644
--- a/stories/chats/src/BubblePlainText.tsx
+++ b/stories/chats/src/BubblePlainText.tsx
@@ -71,7 +71,7 @@ const getTimeFontColor = (message: PlainTextMessage) => {
     }
 
     if (message.status === MessageStatus.Received) {
-        return UILabelColors.TextOverlay;
+        return UILabelColors.TextSecondary;
     }
 
     return UILabelColors.StaticTextOverlayLight;
diff --git a/stories/chats/src/UIChatInput/ChatInputContainer.tsx b/stories/chats/src/UIChatInput/ChatInputContainer.tsx
index 821400a3d..5eaa54be2 100644
--- a/stories/chats/src/UIChatInput/ChatInputContainer.tsx
+++ b/stories/chats/src/UIChatInput/ChatInputContainer.tsx
@@ -87,7 +87,7 @@ export function ChatInputContainer({
                 style={[
                     styles.border,
                     {
-                        backgroundColor: theme[ColorVariants.LineSecondary],
+                        backgroundColor: theme[ColorVariants.BackgroundSecondary],
                         opacity: borderOpacity,
                     },
                 ]}
diff --git a/stories/chats/src/UIChatInput/MenuMore.tsx b/stories/chats/src/UIChatInput/MenuMore.tsx
index 5c2bf5c52..d44b02178 100644
--- a/stories/chats/src/UIChatInput/MenuMore.tsx
+++ b/stories/chats/src/UIChatInput/MenuMore.tsx
@@ -34,7 +34,7 @@ export function MenuMore({ menuMore, menuMoreDisabled }: Props) {
                 <View style={styles.iconWrapper}>
                     <UIImage
                         source={UIAssets.icons.ui.buttonDots}
-                        tintColor={ColorVariants.IconNeutral}
+                        tintColor={ColorVariants.TextTertiary}
                     />
                 </View>
             </View>
diff --git a/stories/chats/src/UIChatInput/MenuPlus.tsx b/stories/chats/src/UIChatInput/MenuPlus.tsx
index 37596d30e..42f7a9e32 100644
--- a/stories/chats/src/UIChatInput/MenuPlus.tsx
+++ b/stories/chats/src/UIChatInput/MenuPlus.tsx
@@ -34,7 +34,7 @@ export function MenuPlus({ menuPlus, menuPlusDisabled }: Props) {
                 <UIImage
                     source={UIAssets.icons.ui.buttonPlus}
                     style={commonStyles.icon}
-                    tintColor={ColorVariants.IconNeutral}
+                    tintColor={ColorVariants.TextTertiary}
                 />
             </View>
         );
diff --git a/stories/chats/src/UIChatInput/Shortcuts.tsx b/stories/chats/src/UIChatInput/Shortcuts.tsx
index 99ccd9ca2..e8a9aea60 100644
--- a/stories/chats/src/UIChatInput/Shortcuts.tsx
+++ b/stories/chats/src/UIChatInput/Shortcuts.tsx
@@ -34,8 +34,8 @@ export function Shortcuts(props: Props) {
                         styles.shortcut,
                         {
                             borderColor: shortcut.isDanger
-                                ? theme[ColorVariants.LineNegative]
-                                : theme[ColorVariants.LineAccent],
+                                ? theme[ColorVariants.BackgroundNegative]
+                                : theme[ColorVariants.BackgroundAccent],
                         },
                         UIStyle.color.getBackgroundColorStyle(
                             theme[ColorVariants.BackgroundPrimary],
diff --git a/stories/chats/src/UICommonChatList.tsx b/stories/chats/src/UICommonChatList.tsx
index 49dd7a6e0..03649ea4b 100644
--- a/stories/chats/src/UICommonChatList.tsx
+++ b/stories/chats/src/UICommonChatList.tsx
@@ -272,7 +272,7 @@ function useLinesAnimation(hasScrollOverflow: React.RefObject<boolean>) {
     const lineStyle = React.useMemo(
         () => [
             styles.border,
-            UIStyle.color.getBackgroundColorStyle(theme[ColorVariants.LineSecondary]),
+            UIStyle.color.getBackgroundColorStyle(theme[ColorVariants.BackgroundSecondary]),
             {
                 opacity: topOpacity.current,
             },
diff --git a/stories/stickers/src/StickersButton.tsx b/stories/stickers/src/StickersButton.tsx
index 691af0d34..1ef96c8ce 100644
--- a/stories/stickers/src/StickersButton.tsx
+++ b/stories/stickers/src/StickersButton.tsx
@@ -33,7 +33,7 @@ export function StickersButton({ editable, inputHasValue, customKeyboardVisible,
                 tintColor={
                     !customKeyboardVisible
                         ? ColorVariants.BackgroundAccent
-                        : ColorVariants.IconNeutral
+                        : ColorVariants.TextTertiary
                 }
             />
         </TouchableOpacity>