diff --git a/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml b/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml
index acc7fbe7..26b09479 100644
--- a/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml
+++ b/Wino.Mail.WinUI/Views/SettingOptionsPage.xaml
@@ -169,16 +169,22 @@
 
 
             <Border
-                Padding="24,20"
+                Padding="12,0,34,20"
                 Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
                 BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
                 BorderThickness="1"
                 CornerRadius="8">
                 <StackPanel Spacing="4">
-                    <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="Quick settings" />
-                    <TextBlock Text="Use navigation menu to fully customize and access all features of Wino." />
+                    <TextBlock
+                        Margin="20,16,0,0"
+                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="Quick settings" />
+                    <TextBlock Margin="20,0,0,12" Text="Use navigation menu to fully customize and access all features of Wino." />
 
-                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsLanguage_Description}" Header="{x:Bind domain:Translator.SettingsLanguage_Title}">
+                    <controls:SettingsCard
+                        Margin="16,0,0,0"
+                        Description="{x:Bind domain:Translator.SettingsLanguage_Description}"
+                        Header="{x:Bind domain:Translator.SettingsLanguage_Title}">
                         <controls:SettingsCard.HeaderIcon>
                             <PathIcon Data="F1 M 4.550781 12.265625 C 3.893229 12.089844 3.28776 11.808269 2.734375 11.420898 C 2.18099 11.033529 1.700846 10.576172 1.293945 10.048828 C 0.887044 9.521484 0.569661 8.938803 0.341797 8.300781 C 0.113932 7.662762 0 7.005209 0 6.328125 C 0 5.748698 0.073242 5.188803 0.219727 4.648438 C 0.366211 4.108073 0.572917 3.603516 0.839844 3.134766 C 1.106771 2.666016 1.429036 2.239584 1.806641 1.855469 C 2.184245 1.471355 2.604167 1.140951 3.066406 0.864258 C 3.528646 0.587566 4.02832 0.37435 4.56543 0.224609 C 5.102539 0.074871 5.664062 0 6.25 0 C 7.115885 0 7.92806 0.162762 8.686523 0.488281 C 9.444986 0.813803 10.107422 1.259766 10.673828 1.826172 C 11.240234 2.392578 11.686197 3.055014 12.011719 3.813477 C 12.337239 4.57194 12.5 5.384115 12.5 6.25 L 11.25 6.25 C 11.25 6.041668 11.236979 5.833334 11.210938 5.625 C 11.184896 5.416667 11.145833 5.208334 11.09375 5 L 8.701172 5 C 8.714192 5.208334 8.725586 5.416667 8.735352 5.625 C 8.745117 5.833334 8.75 6.041668 8.75 6.25 C 8.75 6.673178 8.732096 7.086589 8.696289 7.490234 C 8.660481 7.893881 8.616536 8.304037 8.564453 8.720703 L 8.564453 8.75 L 5.205078 8.75 C 5.23763 8.938803 5.275065 9.122722 5.317383 9.301758 C 5.3597 9.480795 5.406901 9.661459 5.458984 9.84375 L 5.449219 9.853516 C 5.299479 10.257162 5.149739 10.65918 5 11.05957 C 4.85026 11.459961 4.700521 11.861979 4.550781 12.265625 Z M 5.205078 3.75 L 7.294922 3.75 C 7.26888 3.613281 7.226562 3.416342 7.167969 3.15918 C 7.109375 2.90202 7.036133 2.641602 6.948242 2.37793 C 6.860352 2.114258 6.757812 1.875 6.640625 1.660156 C 6.523438 1.445312 6.396484 1.308594 6.259766 1.25 L 6.240234 1.25 C 6.103515 1.308594 5.976562 1.445312 5.859375 1.660156 C 5.742188 1.875 5.639648 2.114258 5.551758 2.37793 C 5.463867 2.641602 5.390625 2.90202 5.332031 3.15918 C 5.273438 3.416342 5.23112 3.613281 5.205078 3.75 Z M 1.914062 3.75 L 3.935547 3.75 C 4.052734 2.988281 4.251302 2.255859 4.53125 1.552734 C 3.977865 1.754559 3.476562 2.044271 3.027344 2.421875 C 2.578125 2.79948 2.207031 3.242188 1.914062 3.75 Z M 10.585938 3.75 C 10.292969 3.242188 9.921875 2.79948 9.472656 2.421875 C 9.023438 2.044271 8.522135 1.754559 7.96875 1.552734 C 8.248697 2.255859 8.447266 2.988281 8.564453 3.75 Z M 1.40625 5 C 1.354167 5.208334 1.315104 5.416667 1.289062 5.625 C 1.263021 5.833334 1.25 6.041668 1.25 6.25 C 1.25 6.458334 1.263021 6.666667 1.289062 6.875 C 1.315104 7.083334 1.354167 7.291667 1.40625 7.5 L 3.798828 7.5 C 3.785807 7.291667 3.774414 7.083334 3.764648 6.875 C 3.754883 6.666667 3.75 6.458334 3.75 6.25 C 3.75 6.041668 3.754883 5.833334 3.764648 5.625 C 3.774414 5.416667 3.785807 5.208334 3.798828 5 Z M 7.451172 5 L 5.048828 5 C 5.035807 5.208334 5.024414 5.416667 5.014648 5.625 C 5.004883 5.833334 5 6.041668 5 6.25 C 5 6.458334 5.004883 6.666667 5.014648 6.875 C 5.024414 7.083334 5.035807 7.291667 5.048828 7.5 L 7.451172 7.5 C 7.464192 7.291667 7.475585 7.083334 7.485352 6.875 C 7.495117 6.666667 7.5 6.458334 7.5 6.25 C 7.5 6.041668 7.495117 5.833334 7.485352 5.625 C 7.475585 5.416667 7.464192 5.208334 7.451172 5 Z M 20 8.125 L 20 10 C 20 10.169271 19.93815 10.315756 19.814453 10.439453 C 19.690754 10.563151 19.54427 10.625 19.375 10.625 C 19.205729 10.625 19.059244 10.563151 18.935547 10.439453 C 18.811848 10.315756 18.75 10.169271 18.75 10 L 18.75 8.75 L 11.25 8.75 L 11.25 10 C 11.25 10.169271 11.18815 10.315756 11.064453 10.439453 C 10.940755 10.563151 10.794271 10.625 10.625 10.625 C 10.455729 10.625 10.309244 10.563151 10.185547 10.439453 C 10.061849 10.315756 10 10.169271 10 10 L 10 8.125 C 10 7.95573 10.061849 7.809246 10.185547 7.685547 C 10.309244 7.56185 10.455729 7.5 10.625 7.5 L 14.375 7.5 C 14.375 7.447917 14.373372 7.394206 14.370117 7.338867 C 14.366861 7.283529 14.365234 7.226563 14.365234 7.167969 C 14.365234 7.057292 14.371744 6.948242 14.384766 6.84082 C 14.397786 6.733398 14.425455 6.635742 14.467773 6.547852 C 14.51009 6.459961 14.573566 6.388347 14.658203 6.333008 C 14.742838 6.27767 14.856771 6.25 15 6.25 C 15.143229 6.25 15.255533 6.27767 15.336914 6.333008 C 15.418294 6.388347 15.480143 6.459961 15.522461 6.547852 C 15.564777 6.635742 15.592447 6.733398 15.605469 6.84082 C 15.618489 6.948242 15.625 7.057292 15.625 7.167969 L 15.625 7.5 L 19.375 7.5 C 19.54427 7.5 19.690754 7.56185 19.814453 7.685547 C 19.93815 7.809246 20 7.95573 20 8.125 Z M 1.923828 8.75 C 2.216797 9.257812 2.587891 9.698894 3.037109 10.073242 C 3.486328 10.447592 3.984375 10.738933 4.53125 10.947266 C 4.251302 10.244141 4.052734 9.511719 3.935547 8.75 Z M 20 13.125 C 20 13.294271 19.93815 13.440756 19.814453 13.564453 C 19.690754 13.688151 19.54427 13.75 19.375 13.75 L 16.25 13.75 L 16.25 16.25 C 16.25 16.425781 16.217447 16.588543 16.152344 16.738281 C 16.087238 16.888021 15.997721 17.019857 15.883789 17.133789 C 15.769856 17.247721 15.638021 17.33724 15.488281 17.402344 C 15.338541 17.467447 15.17578 17.5 15 17.5 L 14.375 17.5 C 14.205729 17.5 14.059244 17.43815 13.935547 17.314453 C 13.811849 17.190756 13.75 17.044271 13.75 16.875 C 13.75 16.731771 13.777669 16.619467 13.833008 16.538086 C 13.888346 16.456705 13.95996 16.394857 14.047852 16.352539 C 14.135741 16.310221 14.233397 16.282553 14.34082 16.269531 C 14.448241 16.256512 14.557291 16.25 14.667969 16.25 L 15 16.25 L 15 13.75 L 11.875 13.75 C 11.705729 13.75 11.559244 13.688151 11.435547 13.564453 C 11.311849 13.440756 11.25 13.294271 11.25 13.125 C 11.25 12.955729 11.311849 12.809245 11.435547 12.685547 C 11.559244 12.56185 11.705729 12.5 11.875 12.5 L 15 12.5 C 14.999999 12.415365 15.027668 12.314453 15.083008 12.197266 C 15.138346 12.080078 15.205078 11.962891 15.283203 11.845703 C 15.361328 11.728516 15.439453 11.617839 15.517578 11.513672 C 15.595703 11.409506 15.657552 11.321615 15.703125 11.25 L 13.125 11.25 C 12.955729 11.25 12.809244 11.188151 12.685547 11.064453 C 12.561849 10.940756 12.5 10.794271 12.5 10.625 C 12.5 10.455729 12.561849 10.309245 12.685547 10.185547 C 12.809244 10.06185 12.955729 10 13.125 10 L 16.875 10 C 17.04427 10 17.190754 10.06185 17.314453 10.185547 C 17.43815 10.309245 17.5 10.455729 17.5 10.625 C 17.5 10.748698 17.464191 10.862631 17.392578 10.966797 L 16.376953 12.5 L 19.375 12.5 C 19.54427 12.5 19.690754 12.56185 19.814453 12.685547 C 19.93815 12.809245 20 12.955729 20 13.125 Z M 10.9375 18.125 C 10.9375 18.300781 10.877278 18.448893 10.756836 18.569336 C 10.636393 18.689779 10.488281 18.75 10.3125 18.75 C 10.182291 18.75 10.063477 18.712564 9.956055 18.637695 C 9.848633 18.562826 9.772135 18.463541 9.726562 18.339844 L 8.945312 16.25 L 6.054688 16.25 L 5.273438 18.339844 C 5.227864 18.463541 5.151367 18.562826 5.043945 18.637695 C 4.936523 18.712564 4.817708 18.75 4.6875 18.75 C 4.518229 18.75 4.371745 18.68815 4.248047 18.564453 C 4.124349 18.440756 4.0625 18.294271 4.0625 18.125 C 4.0625 18.033854 4.075521 17.958984 4.101562 17.900391 L 5.039062 15.419922 C 5.358073 14.580078 5.6722 13.74349 5.981445 12.910156 C 6.290689 12.076823 6.601562 11.240234 6.914062 10.400391 C 6.959635 10.276693 7.03776 10.185547 7.148438 10.126953 C 7.259114 10.068359 7.376302 10.039062 7.5 10.039062 C 7.630208 10.039062 7.747396 10.068359 7.851562 10.126953 C 7.955729 10.185547 8.033854 10.276693 8.085938 10.400391 C 8.398438 11.240234 8.707682 12.076823 9.013672 12.910156 C 9.319661 13.74349 9.635416 14.580078 9.960938 15.419922 L 10.898438 17.900391 C 10.924479 17.958984 10.9375 18.033854 10.9375 18.125 Z M 7.5 12.402344 L 6.523438 15 L 8.476562 15 Z " />
                         </controls:SettingsCard.HeaderIcon>
@@ -191,7 +197,10 @@
                         </ComboBox>
                     </controls:SettingsCard>
 
-                    <controls:SettingsCard Description="{x:Bind domain:Translator.SettingsElementTheme_Description}" Header="{x:Bind domain:Translator.SettingsElementTheme_Title}">
+                    <controls:SettingsCard
+                        Margin="16,0,0,0"
+                        Description="{x:Bind domain:Translator.SettingsElementTheme_Description}"
+                        Header="{x:Bind domain:Translator.SettingsElementTheme_Title}">
                         <controls:SettingsCard.HeaderIcon>
                             <PathIcon Data="F1 M 19.990234 1.796875 C 19.990234 2.011719 19.952799 2.231445 19.87793 2.456055 C 19.803059 2.680664 19.703775 2.880859 19.580078 3.056641 L 17.910156 5.488281 C 16.582031 7.428386 15.157877 9.272461 13.637695 11.020508 C 12.117513 12.768555 10.488281 14.43685 8.75 16.025391 C 8.743489 16.494141 8.662109 16.928711 8.505859 17.329102 C 8.349609 17.729492 8.095703 18.089193 7.744141 18.408203 C 7.444661 18.681641 7.109375 18.917643 6.738281 19.116211 C 6.367187 19.314779 5.979817 19.480795 5.576172 19.614258 C 5.172526 19.747721 4.760742 19.845377 4.34082 19.907227 C 3.920898 19.969076 3.51237 20 3.115234 20 C 2.945963 20 2.740885 19.991861 2.5 19.975586 C 2.259115 19.959311 2.011719 19.933268 1.757812 19.897461 C 1.503906 19.861654 1.259766 19.820963 1.025391 19.775391 C 0.791016 19.729818 0.595703 19.677734 0.439453 19.619141 C 0.302734 19.567057 0.195312 19.492188 0.117188 19.394531 C 0.039062 19.296875 0 19.173178 0 19.023438 C 0 18.834635 0.07487 18.675131 0.224609 18.544922 C 0.478516 18.336588 0.738932 18.126627 1.005859 17.915039 C 1.272786 17.703451 1.520182 17.477213 1.748047 17.236328 C 1.94987 17.027996 2.088216 16.795248 2.163086 16.538086 C 2.237956 16.280924 2.291667 16.012369 2.324219 15.732422 C 2.330729 15.680339 2.333984 15.638021 2.333984 15.605469 C 2.333984 15.572917 2.333984 15.550131 2.333984 15.537109 L 2.333984 15.517578 C 2.327474 15.517578 2.324219 15.514323 2.324219 15.507812 C 2.324219 15.494792 2.325846 15.473633 2.329102 15.444336 C 2.332357 15.415039 2.340495 15.364584 2.353516 15.292969 C 2.392578 14.947917 2.486979 14.617514 2.636719 14.301758 C 2.786458 13.986003 2.985026 13.704428 3.232422 13.457031 C 3.460286 13.229167 3.719075 13.045248 4.008789 12.905273 C 4.298502 12.7653 4.599609 12.659506 4.912109 12.587891 C 6.363932 10.634766 7.919921 8.789062 9.580078 7.050781 C 11.240233 5.312501 13.011066 3.668621 14.892578 2.119141 L 16.806641 0.546875 C 17.001953 0.384115 17.215168 0.255535 17.446289 0.161133 C 17.677408 0.066732 17.919922 0.019531 18.173828 0.019531 C 18.414713 0.019531 18.645832 0.066732 18.867188 0.161133 C 19.088541 0.255535 19.282227 0.382488 19.448242 0.541992 C 19.614258 0.701498 19.746094 0.890301 19.84375 1.108398 C 19.941406 1.326498 19.990234 1.55599 19.990234 1.796875 Z M 18.740234 1.806641 C 18.740234 1.656902 18.681641 1.529949 18.564453 1.425781 C 18.447266 1.321615 18.317057 1.269531 18.173828 1.269531 C 18.06315 1.269531 17.962238 1.292318 17.871094 1.337891 C 17.779947 1.383465 17.692057 1.442059 17.607422 1.513672 L 15.683594 3.085938 C 13.951822 4.498699 12.319336 5.99935 10.786133 7.587891 C 9.25293 9.176433 7.805989 10.85612 6.445312 12.626953 C 6.927083 12.770183 7.34375 13.00944 7.695312 13.344727 C 8.046875 13.680014 8.313802 14.082031 8.496094 14.550781 C 10.078125 13.079428 11.567383 11.531576 12.963867 9.907227 C 14.360351 8.282878 15.667316 6.575521 16.884766 4.785156 L 18.535156 2.363281 C 18.587238 2.285156 18.634439 2.197266 18.676758 2.099609 C 18.719074 2.001953 18.740234 1.904297 18.740234 1.806641 Z M 7.5 16.005859 C 7.5 15.797526 7.478841 15.587565 7.436523 15.375977 C 7.394206 15.164389 7.327474 14.96582 7.236328 14.780273 C 7.145182 14.594727 7.026367 14.427084 6.879883 14.277344 C 6.733398 14.127604 6.552734 14.010417 6.337891 13.925781 C 6.253255 13.893229 6.144205 13.855795 6.010742 13.813477 C 5.877278 13.771159 5.764974 13.75 5.673828 13.75 C 5.400391 13.75 5.118815 13.802084 4.829102 13.90625 C 4.539388 14.010417 4.296875 14.156901 4.101562 14.345703 C 3.886719 14.554037 3.75 14.780273 3.691406 15.024414 C 3.632812 15.268555 3.59375 15.5306 3.574219 15.810547 C 3.561198 16.018881 3.528646 16.233725 3.476562 16.455078 C 3.424479 16.676432 3.36263 16.884766 3.291016 17.080078 C 3.219401 17.262369 3.142904 17.425131 3.061523 17.568359 C 2.980143 17.711588 2.88737 17.843424 2.783203 17.963867 C 2.679036 18.084311 2.565104 18.201498 2.441406 18.31543 C 2.317708 18.429361 2.184245 18.544922 2.041016 18.662109 C 2.216797 18.68815 2.394206 18.709311 2.573242 18.725586 C 2.752279 18.741861 2.932943 18.75 3.115234 18.75 C 3.388672 18.75 3.686523 18.728842 4.008789 18.686523 C 4.331055 18.644205 4.654948 18.577475 4.980469 18.486328 C 5.305989 18.395182 5.620117 18.279623 5.922852 18.139648 C 6.225586 17.999674 6.494141 17.827148 6.728516 17.62207 C 6.962891 17.416992 7.150065 17.18099 7.290039 16.914062 C 7.430013 16.647137 7.5 16.344402 7.5 16.005859 Z " />
                         </controls:SettingsCard.HeaderIcon>
@@ -205,36 +214,17 @@
                             </ComboBox>
                         </controls:SettingsCard.Content>
                     </controls:SettingsCard>
-
-                    <controls:SettingsExpander
-                        x:Name="ManageAccountsExpander"
-                        Description="{x:Bind ViewModel.AccountSummaryText, Mode=OneWay}"
-                        Header="{x:Bind domain:Translator.SettingsManageAccountSettings_Title}"
-                        IsExpanded="True">
-                        <controls:SettingsExpander.HeaderIcon>
-                            <FontIcon Glyph="&#xE77B;" />
-                        </controls:SettingsExpander.HeaderIcon>
-                        <controls:SettingsExpander.Items>
-                            <controls:SettingsCard
-                                Click="AddAccountSettingClicked"
-                                Description="{x:Bind domain:Translator.SettingsManageAccountSettings_Description}"
-                                Header="{x:Bind domain:Translator.Buttons_AddAccount}"
-                                IsClickEnabled="True">
-                                <controls:SettingsCard.HeaderIcon>
-                                    <FontIcon Glyph="&#xE710;" />
-                                </controls:SettingsCard.HeaderIcon>
-                            </controls:SettingsCard>
-
-                            <ListView
-                                x:Name="AccountsList"
-                                Padding="-12,0"
-                                x:Load="{x:Bind ViewModel.HasAccounts, Mode=OneWay}"
-                                IsItemClickEnabled="False"
-                                ItemTemplateSelector="{StaticResource AccountProviderViewModelTemplateSelector}"
-                                ItemsSource="{x:Bind ViewModel.Accounts, Mode=OneWay}"
-                                SelectionMode="None" />
-                        </controls:SettingsExpander.Items>
-                    </controls:SettingsExpander>
+                    <TextBlock
+                        Margin="20,16,0,0"
+                        Style="{StaticResource BodyStrongTextBlockStyle}"
+                        Text="Manage account settings" />
+                    <TextBlock Margin="20,0,0,12" Text="Add new account or manage individidual account settings." />
+                    <ListView
+                        x:Name="AccountsList"
+                        IsItemClickEnabled="False"
+                        ItemTemplateSelector="{StaticResource AccountProviderViewModelTemplateSelector}"
+                        ItemsSource="{x:Bind ViewModel.Accounts, Mode=OneWay}"
+                        SelectionMode="None" />
                 </StackPanel>
             </Border>
         </StackPanel>