diff --git a/WUView/Views/SettingsPage.xaml b/WUView/Views/SettingsPage.xaml
index 4c80bdc..d4ab66e 100644
--- a/WUView/Views/SettingsPage.xaml
+++ b/WUView/Views/SettingsPage.xaml
@@ -69,6 +69,7 @@
 
                 <!--#region Application Settings-->
                 <Expander Grid.Row="2"
+                          materialDesign:ExpanderAssist.HorizontalHeaderPadding="10"
                           IsExpanded="{Binding Setting.AppExpanderOpen,
                                                Source={StaticResource tempconfig}}">
                     <Expander.Header>
@@ -77,7 +78,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="5" />
-                                <RowDefinition Height="auto" />
+                                <RowDefinition Height="24" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="55" />
@@ -100,7 +101,7 @@
                                        TextWrapping="Wrap" />
                         </Grid>
                     </Expander.Header>
-                    <Grid Margin="30,10,0,20">
+                    <Grid Margin="17,10">
                         <!--#region Row & Column definitions-->
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -252,6 +253,7 @@
                 <!--#region UI Settings-->
                 <Expander x:Name="UIExpander"
                           Grid.Row="4"
+                          materialDesign:ExpanderAssist.HorizontalHeaderPadding="10"
                           IsExpanded="{Binding Setting.UIExpanderOpen,
                                                Source={StaticResource tempconfig}}">
                     <Expander.Header>
@@ -260,7 +262,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="5" />
-                                <RowDefinition Height="auto" />
+                                <RowDefinition Height="24" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="55" />
@@ -284,7 +286,7 @@
                         </Grid>
                     </Expander.Header>
 
-                    <Grid Margin="30,10,0,20">
+                    <Grid Margin="17,10">
                         <!--#region Row & Column definitions-->
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -405,6 +407,7 @@
 
                 <!--#region Language-->
                 <Expander x:Name="LangExpander"
+                          materialDesign:ExpanderAssist.HorizontalHeaderPadding="10"
                           Grid.Row="6"
                           IsExpanded="{Binding Setting.LangExpanderOpen,
                                                Source={StaticResource tempconfig}}">
@@ -414,7 +417,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition />
                                 <RowDefinition Height="5" />
-                                <RowDefinition Height="auto" />
+                                <RowDefinition Height="24" />
                             </Grid.RowDefinitions>
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="55" />
@@ -438,7 +441,7 @@
                         </Grid>
                     </Expander.Header>
 
-                    <Grid Margin="30,10,0,20">
+                    <Grid Margin="17,10">
                         <Grid.DataContext>
                             <models:UILanguage />
                         </Grid.DataContext>