diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
index 34e7662c1..3abb3b96c 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/GameListPage.axaml
@@ -238,7 +238,7 @@
       <ScrollViewer
             HorizontalScrollBarVisibility="Disabled"
             VerticalScrollBarVisibility="Auto"
-            Padding="0 0 0 10">
+            Padding="10 0 10 10">
         <ItemsRepeater x:Name="Apps" Items="{Binding SteamApps}">
           <ItemsRepeater.Layout>
             <UniformGridLayout ItemsJustification="SpaceEvenly"
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml
index 78f2821a3..2be4f795c 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/LocalAuthPage.axaml
@@ -85,14 +85,14 @@
 
       <ScrollViewer  HorizontalScrollBarVisibility="Disabled"
                      VerticalScrollBarVisibility="Auto"
-                     Padding="0 0 0 10">
+                     Padding="10 0 10 10">
         <ItemsRepeater Items="{Binding Authenticators,Mode=OneWay}">
           <ItemsRepeater.Layout>
-            <UniformGridLayout ItemsJustification="SpaceAround"
+            <!--<UniformGridLayout ItemsJustification="SpaceAround"
                                MinRowSpacing="20"
-                               MaximumRowsOrColumns="8"/>
-            <!--<WrapLayout HorizontalSpacing="40"
-                      VerticalSpacing="20" Orientation="Horizontal"></WrapLayout>-->
+                               MaximumRowsOrColumns="8"/>-->
+            <WrapLayout HorizontalSpacing="10"
+                      VerticalSpacing="10" Orientation="Horizontal"/>
           </ItemsRepeater.Layout>
           <ItemsRepeater.ItemTemplate>
             <DataTemplate>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml
index d2c18addc..dbaa93125 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/Settings/Settings_UI.axaml
@@ -34,7 +34,7 @@
         </Style>
       </StackPanel.Styles>
 
-      <StackPanel Orientation="Vertical" Spacing="10">
+      <StackPanel Orientation="Vertical">
         <TextBlock Text="{ReflectionBinding Path=Res.Settings_ThemeAccent,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
         <StackPanel Orientation="Horizontal" Spacing="10">
           <RadioButton Content="{ReflectionBinding Path=Res.Settings_UI_SystemDefault,Mode=OneWay,Source={x:Static resx:R.Current}}"
@@ -47,7 +47,7 @@
         </StackPanel>
       </StackPanel>
 
-      <StackPanel Orientation="Vertical" Spacing="10">
+      <StackPanel Orientation="Vertical" Spacing="10" Margin="0 -10 0 0">
         <TextBlock Text="{ReflectionBinding Path=Res.Settings_Theme,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
         <ComboBox x:Name="Themes"
                   SelectedIndex="{Binding Source={x:Static ms:UISettings.Theme},Path=Value, Mode=TwoWay}"
@@ -58,7 +58,7 @@
         </ComboBox>
       </StackPanel>
 
-      <StackPanel Orientation="Vertical" Spacing="10" Margin="0 5 0 0">
+      <StackPanel Orientation="Vertical" Spacing="10">
         <TextBlock Text="{ReflectionBinding Path=Res.Settings_Language,Mode=OneWay,Source={x:Static resx:R.Current}}"/>
         <ComboBox HorizontalAlignment="Stretch" SelectedItem="{Binding SelectLanguage, Mode=TwoWay}" Items="{Binding Mode=OneWay,Source={x:Static resx:R.Languages}}" >
           <ComboBox.ItemTemplate>
diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml
index 25579ef02..fe755005d 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Windows/SteamAccountPage/ShareManageWindow.axaml
@@ -122,12 +122,25 @@
 
                     </DockPanel>
 
-                    <WrapPanel Orientation="Horizontal">
-                      <TextBlock Text="{Binding AccountName}" FontSize="12" Foreground="{DynamicResource InactiveForegroundBrushKey}"/>
-                      <TextBlock Text="(" FontSize="12" Foreground="{DynamicResource InactiveForegroundBrushKey}"/>
-                      <TextBox Text="{Binding SteamId64_Int,Mode=OneWay}" FontSize="12" Classes="readonlybox" Padding="0" Foreground="{DynamicResource InactiveForegroundBrushKey}" IsReadOnly="True"></TextBox>
-                      <TextBlock Text=")" FontSize="12" Foreground="{DynamicResource InactiveForegroundBrushKey}"/>
-                    </WrapPanel>
+                    <StackPanel Orientation="Horizontal">
+                      <TextBlock Text="{Binding AccountName}"
+                                 FontSize="12"
+                                 VerticalAlignment="Center"
+                                 Foreground="{DynamicResource InactiveForegroundBrushKey}"/>
+                      <TextBlock Text="(" FontSize="12"
+                                 VerticalAlignment="Center"
+                                 Foreground="{DynamicResource InactiveForegroundBrushKey}"/>
+                      <TextBox Text="{Binding SteamId64_Int,Mode=OneWay}"
+                                 FontSize="12"
+                                 VerticalAlignment="Center"
+                                 Classes="readonlybox"
+                                 Padding="0"
+                                 Foreground="{DynamicResource InactiveForegroundBrushKey}" IsReadOnly="True"></TextBox>
+                      <TextBlock Text=")"
+                                 VerticalAlignment="Center"
+                                 FontSize="12"
+                                 Foreground="{DynamicResource InactiveForegroundBrushKey}"/>
+                    </StackPanel>
                   </StackPanel>
 
                   <WrapPanel VerticalAlignment="Bottom" Orientation="Horizontal">