diff --git a/ModernKeePass/ResourceDictionaries/Styles.xaml b/ModernKeePass/ResourceDictionaries/Styles.xaml
index eac1bb8..8f2f848 100644
--- a/ModernKeePass/ResourceDictionaries/Styles.xaml
+++ b/ModernKeePass/ResourceDictionaries/Styles.xaml
@@ -5,10 +5,10 @@
     <!-- Common theme values -->
     <x:Double x:Key="MenuWidth">60</x:Double>
     <x:Double x:Key="MenuHeight">40</x:Double>
-    <x:Double x:Key="ExpandedMenuSize">300</x:Double>
+    <x:Double x:Key="ExpandedMenuSize">250</x:Double>
     <GridLength x:Key="MenuHeightGridLength">40</GridLength>
     <GridLength x:Key="MenuWidthGridLength">60</GridLength>
-    <GridLength x:Key="ExpandedMenuGridLength">300</GridLength>
+    <GridLength x:Key="ExpandedMenuGridLength">250</GridLength>
 
     <Color x:Key="MainColor">SlateBlue</Color>
     <Color x:Key="MainColorLight">MediumPurple</Color>
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index 46a22db..19c423a 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -83,7 +83,6 @@
                             AutomationProperties.AutomationId="ItemGridView"
                             AutomationProperties.Name="Entries"
                             TabIndex="1"
-                            Margin="10,0,0,0"
                             SelectionChanged="entries_SelectionChanged"
                             IsSynchronizedWithCurrentItem="False" 
                             BorderBrush="{StaticResource ListViewItemSelectedBackgroundThemeBrush}"
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
index 2993bbe..5c7c133 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
@@ -94,12 +94,12 @@
             <ListView.ItemTemplate>
                 <DataTemplate x:Name="IsNormal">
                     <StackPanel Orientation="Horizontal">
-                        <SymbolIcon Symbol="{Binding Icon, Converter={StaticResource IconToSymbolConverter}, ConverterParameter=48}" Margin="7,15,0,15">
+                        <SymbolIcon Symbol="{Binding Icon, Converter={StaticResource IconToSymbolConverter}, ConverterParameter=48}" Margin="7,10,0,15">
                             <ToolTipService.ToolTip>
                                 <ToolTip Content="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" />
                             </ToolTipService.ToolTip>
                         </SymbolIcon>
-                        <TextBlock Text="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" x:Name="GroupTextBlock" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" />
+                        <TextBlock Text="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" x:Name="GroupTextBlock" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="20,0,10,0" />
                     </StackPanel>
                 </DataTemplate>
             </ListView.ItemTemplate>
@@ -115,13 +115,13 @@
                             BorderThickness="0" 
                             Width="{StaticResource ExpandedMenuSize}" 
                             HorizontalContentAlignment="Left">
-                            <StackPanel Orientation="Horizontal" Margin="17,0,5,0">
+                            <StackPanel Orientation="Horizontal" Margin="17,0,0,0">
                                 <SymbolIcon Symbol="Add">
                                     <ToolTipService.ToolTip>
                                         <ToolTip Content="{Binding ButtonLabel, ElementName=UserControl}" />
                                     </ToolTipService.ToolTip>
                                 </SymbolIcon>
-                                <TextBlock Text="{Binding ButtonLabel, ElementName=UserControl}" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" />
+                                <TextBlock Text="{Binding ButtonLabel, ElementName=UserControl}" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="20,0,0,0" />
                             </StackPanel>
                             <interactivity:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="Click">
@@ -136,7 +136,7 @@
                             x:Name="NewGroupTextBox" 
                             Margin="0,5,0,5" 
                             Visibility="Collapsed"
-                            Width="280"
+                            Width="230"
                             HorizontalAlignment="Center"
                             ButtonCommand="{Binding ActionButtonCommand, ElementName=UserControl}" 
                             ButtonCommandParameter="{Binding RelativeSource={RelativeSource Self}, Path=Text}"
@@ -167,13 +167,13 @@
                                 BorderThickness="0" 
                                 Width="{StaticResource ExpandedMenuSize}" 
                                 HorizontalContentAlignment="Left">
-                            <StackPanel Orientation="Horizontal" Margin="17,0,5,0">
+                            <StackPanel Orientation="Horizontal" Margin="17,0,0,0">
                                 <SymbolIcon Symbol="Home">
                                     <ToolTipService.ToolTip>
                                         <ToolTip x:Uid="HamburgerMenuHomeTooltip" />
                                     </ToolTipService.ToolTip>
                                 </SymbolIcon>
-                                <TextBlock x:Uid="HamburgerMenuHomeLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" />
+                                <TextBlock x:Uid="HamburgerMenuHomeLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="20,0,0,0" />
                             </StackPanel>
                             <interactivity:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="Click">
@@ -189,13 +189,13 @@
                             BorderThickness="0" 
                             Width="{StaticResource ExpandedMenuSize}" 
                             HorizontalContentAlignment="Left">
-                            <StackPanel Orientation="Horizontal" Margin="17,0,5,0">
+                            <StackPanel Orientation="Horizontal" Margin="17,0,0,0">
                                 <SymbolIcon Symbol="Setting">
                                     <ToolTipService.ToolTip>
                                         <ToolTip x:Uid="HamburgerMenuSettingsTooltip" />
                                     </ToolTipService.ToolTip>
                                 </SymbolIcon>
-                                <TextBlock x:Uid="HamburgerMenuSettingsLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="30,0,20,0" />
+                                <TextBlock x:Uid="HamburgerMenuSettingsLabel" FontWeight="SemiBold" TextWrapping="NoWrap" FontSize="16" VerticalAlignment="Center" Margin="20,0,0,0" />
                             </StackPanel>
                             <interactivity:Interaction.Behaviors>
                                 <core:EventTriggerBehavior EventName="Click">