diff --git a/Marechai.App/Presentation/Views/DeleteAccountPage.xaml b/Marechai.App/Presentation/Views/DeleteAccountPage.xaml
index f32204f3..f8c5b2b1 100644
--- a/Marechai.App/Presentation/Views/DeleteAccountPage.xaml
+++ b/Marechai.App/Presentation/Views/DeleteAccountPage.xaml
@@ -15,14 +15,14 @@
     <Grid utu:SafeArea.Insets="VisibleBounds">
         <Grid HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="520" Padding="32">
             <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="#c62828" BorderThickness="2" CornerRadius="8" Padding="0">
+                    BorderBrush="{ThemeResource SystemFillColorCriticalBrush}" BorderThickness="2" CornerRadius="8" Padding="0">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
 
-                    <Border Grid.Row="0" Background="#c62828" Padding="16,12" CornerRadius="6,6,0,0">
+                    <Border Grid.Row="0" Background="{ThemeResource SystemFillColorCriticalBrush}" Padding="16,12" CornerRadius="6,6,0,0">
                         <StackPanel Orientation="Horizontal" Spacing="12">
                             <FontIcon Glyph="&#xE7BA;" FontSize="20" Foreground="White" VerticalAlignment="Center" />
                             <TextBlock Text="{Binding Source={StaticResource Strings}, Path=DeleteAccountPage_Title}"
@@ -68,7 +68,7 @@
                                         Command="{Binding SubmitCommand}"
                                         IsEnabled="{Binding IsSubmitting, Converter={StaticResource InvertBoolConverter}}"
                                         HorizontalAlignment="Stretch"
-                                        Background="#c62828" Foreground="White" />
+                                        Background="{ThemeResource SystemFillColorCriticalBrush}" Foreground="White" />
                             </StackPanel>
 
                             <InfoBar IsOpen="{Binding Submitted, Mode=OneWay}" Severity="Informational" IsClosable="False"
diff --git a/Marechai.App/Presentation/Views/DeletionPendingPage.xaml b/Marechai.App/Presentation/Views/DeletionPendingPage.xaml
index 6d75fa1b..52d76399 100644
--- a/Marechai.App/Presentation/Views/DeletionPendingPage.xaml
+++ b/Marechai.App/Presentation/Views/DeletionPendingPage.xaml
@@ -15,14 +15,14 @@
     <Grid utu:SafeArea.Insets="VisibleBounds">
         <Grid HorizontalAlignment="Center" VerticalAlignment="Center" MaxWidth="520" Padding="32">
             <Border Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
-                    BorderBrush="#c62828" BorderThickness="2" CornerRadius="8" Padding="0">
+                    BorderBrush="{ThemeResource SystemFillColorCriticalBrush}" BorderThickness="2" CornerRadius="8" Padding="0">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="*" />
                     </Grid.RowDefinitions>
 
-                    <Border Grid.Row="0" Background="#c62828" Padding="16,12" CornerRadius="6,6,0,0">
+                    <Border Grid.Row="0" Background="{ThemeResource SystemFillColorCriticalBrush}" Padding="16,12" CornerRadius="6,6,0,0">
                         <StackPanel Orientation="Horizontal" Spacing="12">
                             <FontIcon Glyph="&#xE823;" FontSize="20" Foreground="White" VerticalAlignment="Center" />
                             <TextBlock Text="{Binding Source={StaticResource Strings}, Path=DeletionPendingPage_Title}"
diff --git a/Marechai.App/Presentation/Views/LoginPage.xaml b/Marechai.App/Presentation/Views/LoginPage.xaml
index e0318d82..5805ef41 100644
--- a/Marechai.App/Presentation/Views/LoginPage.xaml
+++ b/Marechai.App/Presentation/Views/LoginPage.xaml
@@ -105,8 +105,8 @@
 
                             <!-- Error Message -->
                             <Border x:Name="ErrorBorder"
-                                    Background="#FFF4E6"
-                                    BorderBrush="#FFB84D"
+                                    Background="{ThemeResource WarningFillColorTertiaryBrush}"
+                                    BorderBrush="{ThemeResource WarningBorderColorDefaultBrush}"
                                     BorderThickness="2"
                                     CornerRadius="4"
                                     Padding="12"
@@ -120,7 +120,7 @@
                                     <!-- Warning Icon -->
                                     <FontIcon Grid.Column="0"
                                               Glyph="&#xE7BA;"
-                                              Foreground="#D97706"
+                                              Foreground="{ThemeResource WarningForegroundColorDefaultBrush}"
                                               FontSize="20"
                                               Margin="0,0,8,0"
                                               VerticalAlignment="Top" />
@@ -128,7 +128,7 @@
                                     <!-- Error Text -->
                                     <TextBlock Grid.Column="1"
                                                Text="{Binding ErrorMessage}"
-                                               Foreground="#92400E"
+                                               Foreground="{ThemeResource WarningForegroundColorDefaultBrush}"
                                                TextWrapping="Wrap"
                                                VerticalAlignment="Center" />
 
@@ -143,7 +143,7 @@
                                             AutomationProperties.Name="Close error message">
                                         <FontIcon Glyph="&#xE711;"
                                                   FontSize="12"
-                                                  Foreground="#92400E" />
+                                                  Foreground="{ThemeResource WarningForegroundColorDefaultBrush}" />
                                     </Button>
                                 </Grid>
                             </Border>
diff --git a/Marechai.App/Presentation/Views/SettingsPage.xaml b/Marechai.App/Presentation/Views/SettingsPage.xaml
index a9b4d46b..63770b97 100644
--- a/Marechai.App/Presentation/Views/SettingsPage.xaml
+++ b/Marechai.App/Presentation/Views/SettingsPage.xaml
@@ -119,13 +119,13 @@
                     </Border>
 
                     <!-- Status / error message -->
-                    <Border Background="#FFF4E6"
-                            BorderBrush="#FFB84D"
+                    <Border Background="{ThemeResource WarningFillColorTertiaryBrush}"
+                            BorderBrush="{ThemeResource WarningBorderColorDefaultBrush}"
                             BorderThickness="1"
                             CornerRadius="4"
                             Padding="8"
                             Visibility="{Binding SecurityMessage, Converter={StaticResource NullToVisibilityConverter}}">
-                        <TextBlock Text="{Binding SecurityMessage}" Foreground="#92400E" TextWrapping="Wrap"/>
+                        <TextBlock Text="{Binding SecurityMessage}" Foreground="{ThemeResource WarningForegroundColorDefaultBrush}" TextWrapping="Wrap"/>
                     </Border>
 
                     <!-- Change password -->
@@ -190,8 +190,8 @@
                     </StackPanel>
 
                     <!-- Recovery codes one-shot display -->
-                    <Border Background="#FFF4E6"
-                            BorderBrush="#FFB84D"
+                    <Border Background="{ThemeResource WarningFillColorTertiaryBrush}"
+                            BorderBrush="{ThemeResource WarningBorderColorDefaultBrush}"
                             BorderThickness="2"
                             CornerRadius="4"
                             Padding="12"
@@ -199,12 +199,12 @@
                         <StackPanel Spacing="8">
                             <TextBlock Text="{Binding Source={StaticResource Strings}, Path=SettingsPage_RecoveryCodesNotice}"
                                        FontWeight="SemiBold"
-                                       Foreground="#92400E"
+                                       Foreground="{ThemeResource WarningForegroundColorDefaultBrush}"
                                        TextWrapping="Wrap"/>
                             <ItemsControl ItemsSource="{Binding DisplayedRecoveryCodes}">
                                 <ItemsControl.ItemTemplate>
                                     <DataTemplate>
-                                        <TextBlock Text="{Binding}" FontFamily="Consolas" Foreground="#92400E"/>
+                                        <TextBlock Text="{Binding}" FontFamily="Consolas" Foreground="{ThemeResource WarningForegroundColorDefaultBrush}"/>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
@@ -220,8 +220,8 @@
                                Style="{ThemeResource SubtitleTextBlockStyle}"/>
                     <CheckBox Content="{Binding Source={StaticResource Strings}, Path=SettingsPage_Notifications_NotifyOnNewMessage}"
                               IsChecked="{Binding NotifyOnNewMessage, Mode=TwoWay}" />
-                    <Border Background="#FFF4E6"
-                            BorderBrush="#FFB84D"
+                    <Border Background="{ThemeResource WarningFillColorTertiaryBrush}"
+                            BorderBrush="{ThemeResource WarningBorderColorDefaultBrush}"
                             BorderThickness="1"
                             CornerRadius="4"
                             Padding="8"
diff --git a/Marechai.App/Presentation/Views/UserReviewEditorControl.xaml b/Marechai.App/Presentation/Views/UserReviewEditorControl.xaml
index bd15d292..9b50929b 100644
--- a/Marechai.App/Presentation/Views/UserReviewEditorControl.xaml
+++ b/Marechai.App/Presentation/Views/UserReviewEditorControl.xaml
@@ -35,13 +35,13 @@
                                       Height="32">
                                     <TextBlock Text="★"
                                                FontSize="24"
-                                               Foreground="#D4AF37"
+                                               Foreground="{ThemeResource WarningForegroundColorDefaultBrush}"
                                                HorizontalAlignment="Center"
                                                VerticalAlignment="Center"
                                                Visibility="{Binding IsFilled, Converter={StaticResource BoolToVisibilityConverter}}" />
                                     <TextBlock Text="★"
                                                FontSize="24"
-                                               Foreground="#D4AF37"
+                                               Foreground="{ThemeResource WarningForegroundColorDefaultBrush}"
                                                Opacity="0.45"
                                                HorizontalAlignment="Center"
                                                VerticalAlignment="Center"