diff --git a/TornadoAce_CJOnStyle/App.xaml b/TornadoAce_CJOnStyle/App.xaml
index a44bafe..684e555 100644
--- a/TornadoAce_CJOnStyle/App.xaml
+++ b/TornadoAce_CJOnStyle/App.xaml
@@ -70,6 +70,9 @@
                 <Setter Property="CornerRadius" Value="7" />
                 <Setter Property="FontFamily" Value="Bahnschrift SemiBold" />
                 <Setter Property="BorderThickness" Value="1" />
+                <Setter Property="UseSystemFocusVisuals" Value="True" />
+                <Setter Property="FocusVisualPrimaryBrush" Value="{StaticResource AccentGreenBrush}" />
+                <Setter Property="FocusVisualSecondaryBrush" Value="{StaticResource PanelStrokeBrush}" />
             </Style>
 
             <Style x:Key="PrimaryActionButtonStyle"
diff --git a/TornadoAce_CJOnStyle/Views/MainPage.xaml b/TornadoAce_CJOnStyle/Views/MainPage.xaml
index d6f40af..e2693eb 100644
--- a/TornadoAce_CJOnStyle/Views/MainPage.xaml
+++ b/TornadoAce_CJOnStyle/Views/MainPage.xaml
@@ -120,11 +120,11 @@
 
                     <Grid ColumnSpacing="16">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="792" />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        <StackPanel Spacing="8">
+                        <StackPanel HorizontalAlignment="Left" Spacing="8">
                             <StackPanel Orientation="Horizontal" Spacing="9">
                                 <Border
                                     Width="34"
@@ -141,8 +141,10 @@
                                 Style="{StaticResource PageTitleTextStyle}"
                                 Text="CG 제작 자동화 컨트롤" />
                             <TextBlock
+                                HorizontalAlignment="Left"
                                 MaxWidth="880"
                                 Style="{StaticResource BodyTextStyle}"
+                                TextAlignment="Left"
                                 Text="{x:Bind ViewModel.OperatorMessage, Mode=OneWay}" />
                         </StackPanel>
 
@@ -153,6 +155,17 @@
                             Spacing="8"
                             VerticalAlignment="Top">
                             <Grid ColumnSpacing="8" RowSpacing="8">
+                                <Grid.Resources>
+                                    <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#2A2333" />
+                                    <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#17121E" />
+                                    <SolidColorBrush x:Key="ButtonBackgroundDisabled" Color="#141019" />
+                                    <SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="#FFFFFF" />
+                                    <SolidColorBrush x:Key="ButtonForegroundPressed" Color="#F8F5EE" />
+                                    <SolidColorBrush x:Key="ButtonForegroundDisabled" Color="#675D72" />
+                                    <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#5A476C" />
+                                    <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#C8FF17" />
+                                    <SolidColorBrush x:Key="ButtonBorderBrushDisabled" Color="#241E2D" />
+                                </Grid.Resources>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
@@ -165,6 +178,12 @@
                                     Command="{x:Bind ViewModel.RunPocCommand}"
                                     HorizontalAlignment="Stretch"
                                     Style="{StaticResource PrimaryActionButtonStyle}">
+                                    <Button.Resources>
+                                        <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#8C36D2" />
+                                        <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#63229B" />
+                                        <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#AAC8FF17" />
+                                        <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#FFC8FF17" />
+                                    </Button.Resources>
                                     <StackPanel Orientation="Horizontal" Spacing="7">
                                         <SymbolIcon Symbol="Play" />
                                         <TextBlock Text="PoC 실행" />
@@ -674,6 +693,8 @@
                                 <Border
                                     Padding="10,8"
                                     Background="{StaticResource PanelAltBrush}"
+                                    BorderBrush="{StaticResource PanelSoftStrokeBrush}"
+                                    BorderThickness="1"
                                     CornerRadius="8">
                                     <Grid ColumnSpacing="10">
                                         <Grid.ColumnDefinitions>
@@ -789,6 +810,8 @@
                                                     Margin="0,0,0,10"
                                                     Padding="10"
                                                     Background="{StaticResource PanelAltBrush}"
+                                                    BorderBrush="{StaticResource PanelSoftStrokeBrush}"
+                                                    BorderThickness="1"
                                                     CornerRadius="8">
                                                     <StackPanel Spacing="6">
                                                         <Grid ColumnSpacing="8">
@@ -849,6 +872,8 @@
                                                     Margin="0,0,0,10"
                                                     Padding="10"
                                                     Background="{StaticResource PanelAltBrush}"
+                                                    BorderBrush="{StaticResource PanelSoftStrokeBrush}"
+                                                    BorderThickness="1"
                                                     CornerRadius="8">
                                                     <StackPanel Spacing="7">
                                                         <Grid ColumnSpacing="8">
@@ -1053,12 +1078,14 @@
                             MinHeight="44"
                             Margin="0,4,0,0"
                             HorizontalAlignment="Stretch"
-                            Background="{StaticResource AccentVioletBrush}"
-                            BorderBrush="#88C8FF17"
-                            BorderThickness="1"
                             Click="LoginButton_Click"
-                            CornerRadius="5"
-                            Foreground="White">
+                            Style="{StaticResource PrimaryActionButtonStyle}">
+                            <Button.Resources>
+                                <SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#8C36D2" />
+                                <SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#63229B" />
+                                <SolidColorBrush x:Key="ButtonBorderBrushPointerOver" Color="#AAC8FF17" />
+                                <SolidColorBrush x:Key="ButtonBorderBrushPressed" Color="#FFC8FF17" />
+                            </Button.Resources>
                             <StackPanel
                                 HorizontalAlignment="Center"
                                 Orientation="Horizontal"
@@ -1126,7 +1153,7 @@
                     <ProgressBar
                         Height="5"
                         IsIndeterminate="True"
-                        Foreground="#C8FF17" />
+                        Foreground="{StaticResource AccentGreenBrush}" />
                 </StackPanel>
             </Border>
         </Grid>