diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml
index 91871fe01..7916d038c 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/Settings/Settings_UI.axaml
@@ -12,7 +12,7 @@
 				  HorizontalAlignment="Stretch"
 				  Spacing="16">
                 <StackPanel Orientation="Vertical">
-                    <TextBlock Text="{Binding Path=Res.Language,Mode=OneWay,Source={x:Static resx:R.Current}}" Margin="0 0 0 20"/>
+                    <TextBlock Text="{Binding Path=Res.Settings_Language,Mode=OneWay,Source={x:Static resx:R.Current}}" Margin="0 0 0 20" Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
                     <ComboBox HorizontalAlignment="Stretch"
 							  SelectedItem="{Binding CurrentLanguage}"
 							  Items="{Binding Mode=OneWay,Source={x:Static resx:R.Languages}}" >
@@ -24,7 +24,7 @@
                     </ComboBox>
                 </StackPanel>
                 <StackPanel Orientation="Vertical">
-                    <TextBlock Text="{Binding Path=Res.Settings_Theme,Mode=OneWay,Source={x:Static resx:R.Current}}" Margin="0 0 0 20"/>
+                    <TextBlock Text="{Binding Path=Res.Settings_Theme,Mode=OneWay,Source={x:Static resx:R.Current}}" Margin="0 0 0 20" Foreground="{DynamicResource HighlightForegroundBrushKey}"/>
                     <ComboBox x:Name="Themes" SelectedIndex="0" HorizontalAlignment="Stretch">
                         <ComboBoxItem>Light</ComboBoxItem>
                         <ComboBoxItem>Dark</ComboBoxItem>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml
index 9da7dd1fa..a8df6f4df 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Pages/SteamAccountPage.axaml
@@ -7,6 +7,7 @@
              xmlns:controls="clr-namespace:System.Application.UI.Views.Controls"
              xmlns:i="using:Avalonia.Xaml.Interactivity"
              xmlns:ia="using:Avalonia.Xaml.Interactions.Core"
+             x:Name="u"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="System.Application.UI.Views.Pages.SteamAccountPage">
     <Design.DataContext>
@@ -21,16 +22,40 @@
                 </ItemsRepeater.Layout>
                 <ItemsRepeater.ItemTemplate>
                     <DataTemplate>
-                        <StackPanel x:Name="panel" Margin="20" Spacing="8" Width="184">
+                        <StackPanel x:Name="panel" Margin="20" Spacing="8" Width="184" Cursor="Hand">
                             <DockPanel LastChildFill="True">
                                 <Border DockPanel.Dock="Top" Classes="paper">
-                                    <Panel Width="{Binding #panel.Width}">
+                                    <Panel Width="{Binding #panel.Width}" x:Name="card">
+                                        <i:Interaction.Behaviors>
+                                            <ia:EventTriggerBehavior EventName="PointerEnter" SourceObject="{Binding #card}">
+                                                <ia:ChangePropertyAction TargetObject="{Binding #login_btn}" PropertyName="IsVisible" Value="True"/>
+                                            </ia:EventTriggerBehavior>
+                                            <ia:EventTriggerBehavior EventName="PointerLeave" SourceObject="{Binding #card}">
+                                                <ia:ChangePropertyAction TargetObject="{Binding #login_btn}" PropertyName="IsVisible" Value="False"/>
+                                            </ia:EventTriggerBehavior>
+                                        </i:Interaction.Behaviors>
                                         <Image x:Name="avatar" Width="{Binding #panel.Width}" Stretch="Uniform" Source="{Binding AvatarStream,Converter={StaticResource BitmapAssetValueConverter}}"
                                           IsVisible="{Binding AvatarStream,Converter={StaticResource IsNullConverter},ConverterParameter=invert}"/>
                                         <Image Width="{Binding #panel.Width}" Stretch="Uniform" Source="avares://System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Assets/AppResources/avater.jpg" IsVisible="{Binding !#avatar.IsVisible}}" />
-                                        <DrawingPresenter>
+                                        
+                                        <Border VerticalAlignment="Bottom" HorizontalAlignment="Stretch" Classes="button" IsVisible="False" x:Name="login_btn">
+                                            <Button Content="{Binding Path=Res.UserChange_BtnTootlip,Mode=OneWay,Source={x:Static resx:R.Current}}" HorizontalAlignment="Stretch" Command="{Binding #u.DataContext.SteamId_Click}" CommandParameter="{Binding AccountName}"></Button>
+                                        </Border>
 
-                                        </DrawingPresenter>
+                                        <Ellipse VerticalAlignment="Bottom"
+                                                 HorizontalAlignment="Right"
+                                                 x:Name="circle" Margin="5"
+                                                 Height="10" Width="10"
+                                                 StrokeThickness="0" ToolTip.Tip="{Binding OnlineState}">
+                                            <i:Interaction.Behaviors>
+                                                <ia:DataTriggerBehavior Binding="{Binding OnlineState}" ComparisonCondition="Equal" Value="online">
+                                                    <ia:ChangePropertyAction TargetObject="{Binding #circle}" PropertyName="Fill" Value="#08D969"/>
+                                                </ia:DataTriggerBehavior>
+                                                <ia:DataTriggerBehavior Binding="{Binding OnlineState}" ComparisonCondition="Equal" Value="offline">
+                                                    <ia:ChangePropertyAction TargetObject="{Binding #circle}" PropertyName="Fill" Value="#adadad"/>
+                                                </ia:DataTriggerBehavior>
+                                            </i:Interaction.Behaviors>
+                                        </Ellipse>
                                     </Panel>
                                 </Border>
                             </DockPanel>
diff --git a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml
index 04c7a08a9..a2aad8aff 100644
--- a/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml
+++ b/System.Application.SteamTools.Client.Desktop.Avalonia/Application/UI/Styles/Controls/Border.xaml
@@ -20,4 +20,15 @@
     <Style Selector="Border.paper">
         <Setter Property="BoxShadow" Value="2 2 5 #55000000" />
     </Style>
+    <Style Selector="Border.paper:pointerover">
+        <Setter Property="BoxShadow" Value="4 6 10 #55000000" />
+    </Style>
+
+    <Style Selector="Border.button">
+        <Setter Property="Background" Value="{DynamicResource BackgroundBrushKey}" />
+        <Setter Property="BoxShadow" Value="2 2 5 #55000000" />
+    </Style>
+    <Style Selector="Border.button:pointerover">
+        <Setter Property="BoxShadow" Value="4 6 10 #55000000" />
+    </Style>
 </Styles>
diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.Designer.cs b/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.Designer.cs
index f4884e279..03fd76a36 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -96,6 +96,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 制作人员名单 的本地化字符串。
+        /// </summary>
+        public static string About_ProductionStaff {
+            get {
+                return ResourceManager.GetString("About_ProductionStaff", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 此软件 的本地化字符串。
         /// </summary>
@@ -196,7 +205,7 @@ namespace System.Application.UI.Resx {
         }
         
         /// <summary>
-        ///   查找类似 自动挂卡 的本地化字符串。
+        ///   查找类似 自动集卡 的本地化字符串。
         /// </summary>
         public static string IdleCard {
             get {
@@ -204,15 +213,6 @@ namespace System.Application.UI.Resx {
             }
         }
         
-        /// <summary>
-        ///   查找类似 语言 的本地化字符串。
-        /// </summary>
-        public static string Language {
-            get {
-                return ResourceManager.GetString("Language", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   查找类似 其它平台 的本地化字符串。
         /// </summary>
@@ -249,6 +249,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 语言 的本地化字符串。
+        /// </summary>
+        public static string Settings_Language {
+            get {
+                return ResourceManager.GetString("Settings_Language", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 主题 的本地化字符串。
         /// </summary>
@@ -276,6 +285,15 @@ namespace System.Application.UI.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 以该账号登录Steam 的本地化字符串。
+        /// </summary>
+        public static string UserChange_BtnTootlip {
+            get {
+                return ResourceManager.GetString("UserChange_BtnTootlip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 账号切换 的本地化字符串。
         /// </summary>
diff --git a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.resx b/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.resx
index 3dca9a0e8..c9761f6fa 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.resx
+++ b/System.Application.SteamTools.Client.Desktop/UI/Resx/AppResources.resx
@@ -129,6 +129,9 @@
   <data name="About_OpenSource" xml:space="preserve">
     <value>开放源代码许可</value>
   </data>
+  <data name="About_ProductionStaff" xml:space="preserve">
+    <value>制作人员名单</value>
+  </data>
   <data name="About_ThisSoft" xml:space="preserve">
     <value>此软件</value>
   </data>
@@ -163,10 +166,7 @@
     <value>写入 hosts 时发生错误</value>
   </data>
   <data name="IdleCard" xml:space="preserve">
-    <value>自动挂卡</value>
-  </data>
-  <data name="Language" xml:space="preserve">
-    <value>语言</value>
+    <value>自动集卡</value>
   </data>
   <data name="OtherGamePlaform" xml:space="preserve">
     <value>其它平台</value>
@@ -180,6 +180,9 @@
   <data name="Settings_General" xml:space="preserve">
     <value>基本设置</value>
   </data>
+  <data name="Settings_Language" xml:space="preserve">
+    <value>语言</value>
+  </data>
   <data name="Settings_Theme" xml:space="preserve">
     <value>主题</value>
   </data>
@@ -189,6 +192,9 @@
   <data name="SteamAuth" xml:space="preserve">
     <value>本地令牌</value>
   </data>
+  <data name="UserChange_BtnTootlip" xml:space="preserve">
+    <value>以该账号登录Steam</value>
+  </data>
   <data name="UserFastChange" xml:space="preserve">
     <value>账号切换</value>
   </data>
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
index 65acbf5bd..81ec30657 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/MainWindowViewModel.cs
@@ -72,6 +72,10 @@ namespace System.Application.UI.ViewModels
 
             this.SelectedItem = this.TabItems.First();
 
+            if (ViewModelBase.IsInDesignMode) 
+            {
+                return;
+            }
             Task.Run(Initialize).ContinueWith(s =>
             {
                 Log.Error(nameof(MainWindowViewModel), s.Exception, nameof(Initialize) + "Action Error");
diff --git a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
index 29969dcc6..c2bc3743b 100644
--- a/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
+++ b/System.Application.SteamTools.Client.Desktop/UI/ViewModels/Pages/SteamAccountPageViewModel.cs
@@ -11,6 +11,9 @@ namespace System.Application.UI.ViewModels
 {
     public class SteamAccountPageViewModel : TabItemViewModel
     {
+        readonly ISteamService steamService = DI.Get<ISteamService>();
+        readonly IHttpService httpService = DI.Get<IHttpService>();
+        readonly ISteamworksWebApiService webApiService = DI.Get<ISteamworksWebApiService>();
 
         public override string Name
         {
@@ -30,9 +33,6 @@ namespace System.Application.UI.ViewModels
 
         internal async override Task Initialize()
         {
-            ISteamService steamService = DI.Get<ISteamService>();
-            IHttpService httpService = DI.Get<IHttpService>();
-            ISteamworksWebApiService webApiService = DI.Get<ISteamworksWebApiService>();
 
             SteamUsers = new ObservableCollection<SteamUser>(steamService.GetRememberUserList());
             if (!SteamUsers.Any_Nullable())
@@ -58,5 +58,14 @@ namespace System.Application.UI.ViewModels
             }
             SteamUsers = new ObservableCollection<SteamUser>(users.OrderByDescending(o => o.RememberPassword).ThenByDescending(o => o.LastLoginTime).ToList());
         }
+
+
+        public void SteamId_Click(string accountName)
+        {
+            //steamService.SetCurrentUser(accountName);
+            steamService.TryKillSteamProcess();
+            steamService.StartSteam();
+        }
+
     }
 }
\ No newline at end of file