diff --git a/src/Files.App/Helpers/FilePropertiesHelpers.cs b/src/Files.App/Helpers/FilePropertiesHelpers.cs
index a901baae5aea..5460a45d9591 100644
--- a/src/Files.App/Helpers/FilePropertiesHelpers.cs
+++ b/src/Files.App/Helpers/FilePropertiesHelpers.cs
@@ -70,7 +70,7 @@ public static async Task OpenPropertiesWindowAsync(object item, IShellPage assoc
 					IsMaximizable = false,
 					MinWidth = 460,
 					MinHeight = 550,
-					Width = 600,
+					Width = 800,
 					Height = 550,
 					Content = frame,
 					Backdrop = new WinUIEx.MicaSystemBackdrop(),
@@ -103,6 +103,7 @@ public static async Task OpenPropertiesWindowAsync(object item, IShellPage assoc
 						Y = displayArea.WorkArea.Y
 							+ Math.Max(0, Math.Min(displayArea.WorkArea.Height - appWindow.Size.Height, pointerPosition.Y - displayArea.WorkArea.Y)),
 					};
+
 					appWindow.Move(appWindowPos);
 				}
 			}
@@ -111,6 +112,7 @@ public static async Task OpenPropertiesWindowAsync(object item, IShellPage assoc
 				var dialog = new PropertiesDialog();
 				dialog.propertiesFrame.Tag = dialog;
 				Navigate(dialog.propertiesFrame);
+
 				await dialog.ShowAsync(ContentDialogPlacement.Popup);
 			}
 
diff --git a/src/Files.App/ResourceDictionaries/NavigationViewItemButtonStyle.xaml b/src/Files.App/ResourceDictionaries/NavigationViewItemButtonStyle.xaml
index ee3478425227..ab241370b9e8 100644
--- a/src/Files.App/ResourceDictionaries/NavigationViewItemButtonStyle.xaml
+++ b/src/Files.App/ResourceDictionaries/NavigationViewItemButtonStyle.xaml
@@ -57,6 +57,8 @@
 
 	<Thickness x:Key="NavigationViewItemBorderThickness">1,1,1,1</Thickness>
 	<x:Double x:Key="NavigationViewItemOnLeftMinHeight">40</x:Double>
+	<Thickness x:Key="NavigationViewCompactItemContentPresenterMargin">2,0,0,0</Thickness>
+	<Thickness x:Key="NavigationViewItemContentPresenterMargin">2,0,0,2</Thickness>
 
 	<Style x:Key="MUX_NavigationViewItemPresenterStyleWhenOnLeftPane" TargetType="primitives:NavigationViewItemPresenter">
 		<Setter Property="Foreground" Value="{ThemeResource NavigationViewItemForeground}" />
@@ -118,7 +120,6 @@
 							<Grid
 								x:Name="ContentGrid"
 								MinHeight="{ThemeResource NavigationViewItemOnLeftMinHeight}"
-								Margin="0,0,14,0"
 								HorizontalAlignment="Stretch">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="Auto" />
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml b/src/Files.App/Views/Properties/MainPropertiesPage.xaml
index e1e198863f44..5a11fba9b4c4 100644
--- a/src/Files.App/Views/Properties/MainPropertiesPage.xaml
+++ b/src/Files.App/Views/Properties/MainPropertiesPage.xaml
@@ -7,28 +7,29 @@
 	xmlns:helpers="using:Files.App.Helpers"
 	xmlns:local="using:Files.App.Views.Properties"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:toolkitconvers="using:CommunityToolkit.WinUI.UI.Converters"
-	xmlns:usercontrols="using:Files.App.UserControls"
+	xmlns:uc="using:Files.App.UserControls"
+	xmlns:wctconverters="using:CommunityToolkit.WinUI.UI.Converters"
 	Background="{ThemeResource App.Theme.BackgroundBrush}"
 	KeyDown="Page_KeyDown"
 	Loaded="Page_Loaded"
+	SizeChanged="MainPropertiesPage_SizeChanged"
 	mc:Ignorable="d">
 
 	<Page.Resources>
 		<ResourceDictionary>
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
-				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/NavigationViewStoreStyle.xaml" />
+				<ResourceDictionary Source="ms-appx:///ResourceDictionaries/NavigationViewItemButtonStyle.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 
-			<toolkitconvers:BoolNegationConverter x:Key="BoolNegationConverter" />
+			<wctconverters:BoolNegationConverter x:Key="BoolNegationConverter" />
 
-			<toolkitconvers:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-			<toolkitconvers:BoolToVisibilityConverter
+			<wctconverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+			<wctconverters:BoolToVisibilityConverter
 				x:Key="BoolToVisibilityInverseConverter"
 				FalseValue="Visible"
 				TrueValue="Collapsed" />
+
 		</ResourceDictionary>
 	</Page.Resources>
 
@@ -37,127 +38,104 @@
 			<RowDefinition Height="36" />
 			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
-			<ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
 
 		<!--  Titlebar  -->
-		<Border
-			x:Name="TitlebarArea"
-			Grid.ColumnSpan="2"
-			Height="36"
-			Background="Transparent">
-			<StackPanel
-				Padding="12,0"
-				Orientation="Horizontal"
-				Spacing="8">
-
-				<Image
-					Width="20"
-					Height="20"
-					Source="ms-appx:///Assets/AppTiles/Dev/Square44x44Logo.png" />
-
-				<TextBlock
-					VerticalAlignment="Center"
-					Style="{StaticResource CaptionTextBlockStyle}"
-					Text="{helpers:ResourceString Name=Properties}" />
-
-			</StackPanel>
+		<Border x:Name="TitlebarArea" Height="40">
+			<TextBlock
+				Padding="16,0"
+				VerticalAlignment="Center"
+				Style="{StaticResource BodyStrongTextBlockStyle}"
+				Text="{helpers:ResourceString Name=Properties}" />
 		</Border>
 
-		<!--  Vertical NavigationView whose each items are squared  -->
+		<!--  Main NavigationView  -->
 		<NavigationView
 			x:Name="MainPropertiesWindowNavigationView"
 			Grid.Row="1"
-			Width="80"
 			IsBackButtonVisible="Collapsed"
 			IsPaneToggleButtonVisible="False"
 			IsSettingsVisible="False"
 			IsTitleBarAutoPaddingEnabled="False"
 			MenuItemsSource="{x:Bind NavViewItems, Mode=TwoWay}"
-			OpenPaneLength="88"
+			OpenPaneLength="180"
 			PaneDisplayMode="Left"
 			SelectionChanged="MainPropertiesWindowNavigationView_SelectionChanged">
 
 			<NavigationView.MenuItemTemplate>
-				<DataTemplate x:DataType="local:SquareNavViewItem">
-					<NavigationViewItem
-						Height="64"
-						IsSelected="{x:Bind IsSelected, Mode=TwoWay}"
-						Tag="{x:Bind ItemType}">
+				<DataTemplate x:DataType="local:NavigationViewItemButtonStyleItem">
+					<NavigationViewItem IsSelected="{x:Bind IsSelected, Mode=TwoWay}" Tag="{x:Bind ItemType}">
 						<NavigationViewItem.Content>
-							<StackPanel Spacing="4">
+							<Grid>
+								<Grid.ColumnDefinitions>
+									<ColumnDefinition Width="Auto" />
+									<ColumnDefinition Width="*" />
+								</Grid.ColumnDefinitions>
 
 								<!--  Icon  -->
 								<Viewbox
-									Width="24"
-									Height="24"
+									Width="16"
+									Height="16"
 									VerticalAlignment="Center">
-									<usercontrols:OpacityIcon IsSelected="{x:Bind IsSelected, Mode=OneWay}" Style="{x:Bind OpacityIconStyle, Mode=OneWay}" />
+									<uc:OpacityIcon IsSelected="{x:Bind IsSelected, Mode=OneWay}" Style="{x:Bind OpacityIconStyle, Mode=OneWay}" />
 								</Viewbox>
 
 								<!--  Label  -->
 								<TextBlock
 									x:Name="ItemNameLabelTextBlock"
-									Grid.Row="1"
-									HorizontalAlignment="Center"
-									FontSize="10"
-									Style="{StaticResource CaptionTextBlockStyle}"
-									Text="{x:Bind Name}" />
-
-							</StackPanel>
+									Grid.Column="1"
+									Margin="8,0,0,0"
+									VerticalAlignment="Center"
+									Style="{StaticResource BodyTextBlockStyle}"
+									Text="{x:Bind Name}"
+									Visibility="{x:Bind IsCompact, Converter={StaticResource BoolToVisibilityInverseConverter}, Mode=OneWay}" />
+
+							</Grid>
 						</NavigationViewItem.Content>
 					</NavigationViewItem>
 				</DataTemplate>
 			</NavigationView.MenuItemTemplate>
 
-		</NavigationView>
+			<!--  NavigationView Content, Save/Cancel buttons  -->
+			<NavigationView.Content>
+				<Grid>
+					<Grid.RowDefinitions>
+						<RowDefinition Height="*" />
+						<RowDefinition Height="52" />
+					</Grid.RowDefinitions>
+
+					<Frame x:Name="contentFrame" IsNavigationStackEnabled="False" />
+
+					<Grid
+						Grid.Row="1"
+						Background="{ThemeResource CardBackgroundFillColorSecondary}"
+						BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
+						BorderThickness="0,1,0,0">
+						<StackPanel
+							Margin="12,0"
+							HorizontalAlignment="Right"
+							Orientation="Horizontal"
+							Spacing="12">
+
+							<Button
+								x:Name="SaveChangesButton"
+								Width="96"
+								Click="SaveChangesButton_Click"
+								Content="{helpers:ResourceString Name=Save}"
+								Style="{StaticResource AccentButtonStyle}" />
+
+							<Button
+								x:Name="CancelChangesButton"
+								Width="96"
+								Click="CancelChangesButton_Click"
+								Content="{helpers:ResourceString Name=Cancel}" />
+
+						</StackPanel>
+					</Grid>
+
+				</Grid>
+			</NavigationView.Content>
 
-		<!--  NavigationView Content, Save/Cancel buttons  -->
-		<Grid
-			Grid.Row="1"
-			Grid.Column="1"
-			Background="{ThemeResource LayerFillColorDefaultBrush}"
-			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-			BorderThickness="1,1,0,0"
-			CornerRadius="8,0,0,0">
-			<Grid.RowDefinitions>
-				<RowDefinition Height="*" />
-				<RowDefinition Height="Auto" />
-			</Grid.RowDefinitions>
-
-			<Frame x:Name="contentFrame" IsNavigationStackEnabled="False" />
-
-			<Grid
-				Grid.Row="2"
-				Height="58"
-				Background="{ThemeResource CardBackgroundFillColorSecondary}"
-				BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
-				BorderThickness="0,1,0,0">
-				<StackPanel
-					Margin="12,0"
-					HorizontalAlignment="Right"
-					Orientation="Horizontal"
-					Spacing="12">
-
-					<Button
-						x:Name="SaveChangesButton"
-						Width="96"
-						Click="SaveChangesButton_Click"
-						Content="{helpers:ResourceString Name=Save}"
-						Style="{StaticResource AccentButtonStyle}" />
-
-					<Button
-						x:Name="CancelChangesButton"
-						Width="96"
-						Click="CancelChangesButton_Click"
-						Content="{helpers:ResourceString Name=Cancel}" />
-
-				</StackPanel>
-			</Grid>
-
-		</Grid>
+		</NavigationView>
 
 	</Grid>
 </Page>
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
index badb4933d88a..809f8e69e942 100644
--- a/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
+++ b/src/Files.App/Views/Properties/MainPropertiesPage.xaml.cs
@@ -22,7 +22,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.Foundation.Metadata;
-using Windows.Graphics;
 using Windows.System;
 using Windows.UI;
 
@@ -43,9 +42,10 @@ public sealed partial class MainPropertiesPage : Page
 		public readonly SettingsViewModel AppSettings;
 
 		public Window Window;
+
 		public AppWindow AppWindow;
 
-		public ObservableCollection<SquareNavViewItem> NavViewItems { get; set; }
+		public ObservableCollection<NavigationViewItemButtonStyleItem> NavViewItems { get; set; }
 
 		public MainPropertiesPage()
 		{
@@ -98,6 +98,22 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
 			}
 		}
 
+		private void MainPropertiesPage_SizeChanged(object sender, SizeChangedEventArgs e)
+		{
+			UpdateDialogLayout();
+		}
+
+		private void UpdateDialogLayout()
+		{
+			MainPropertiesWindowNavigationView.PaneDisplayMode =
+				ActualWidth <= 600 ? NavigationViewPaneDisplayMode.LeftCompact : NavigationViewPaneDisplayMode.Left;
+
+			if (ActualWidth <= 600)
+				foreach (var item in NavViewItems) item.IsCompact = true;
+			else
+				foreach (var item in NavViewItems) item.IsCompact = false;
+		}
+
 		private async void AppSettings_ThemeModeChanged(object? sender, EventArgs e)
 		{
 			await DispatcherQueue.EnqueueAsync(() =>
@@ -167,49 +183,49 @@ private void MainPropertiesWindowNavigationView_SelectionChanged(NavigationView
 
 		private void AddNavigationViewItemsToControl(object item)
 		{
-			var generalItem = new SquareNavViewItem()
+			var generalItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "General".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemGeneral,
 				OpacityIconStyle = (Style)Application.Current.Resources["ColorIconGeneralProperties"],
 			};
-			var securityItem = new SquareNavViewItem()
+			var securityItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "Security".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemSecurity,
 				OpacityIconStyle = (Style)Application.Current.Resources["ColorIconSecurityProperties"],
 			};
-			var hashItem = new SquareNavViewItem()
+			var hashItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "Hashes".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemHash,
 				OpacityIconStyle = (Style)Application.Current.Resources["ColorIconHashesProperties"],
 			};
-			var shortcutItem = new SquareNavViewItem()
+			var shortcutItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "Shortcut".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemShortcut,
 				OpacityIconStyle = (Style)Application.Current.Resources["ColorIconShortcutProperties"],
 			};
-			var libraryItem = new SquareNavViewItem()
+			var libraryItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "Library".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemLibrary,
 				OpacityIconStyle = (Style)Application.Current.Resources["ColorIconLibraryProperties"],
 			};
-			var detailsItem = new SquareNavViewItem()
+			var detailsItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "Details".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemDetails,
 				OpacityIconStyle = (Style)Application.Current.Resources["ColorIconDetailsProperties"],
 			};
-			var customizationItem = new SquareNavViewItem()
+			var customizationItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "Customization".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemCustomization,
 				OpacityIconStyle = (Style)Application.Current.Resources["ColorIconCustomizationProperties"],
 			};
-			var compatibilityItem = new SquareNavViewItem()
+			var compatibilityItem = new NavigationViewItemButtonStyleItem()
 			{
 				Name = "Compatibility".GetLocalizedResource(),
 				ItemType = PropertyNavigationViewItemEnums.ItemCompatibility,
@@ -241,7 +257,7 @@ private void AddNavigationViewItemsToControl(object item)
 				NavViewItems.Remove(securityItem);
 				NavViewItems.Remove(customizationItem);
 				NavViewItems.Remove(hashItem);
-			} 
+			}
 			else if (item is ListedItem listedItem)
 			{
 				var isShortcut = listedItem.IsShortcut;
@@ -369,7 +385,8 @@ public class PropertyNavParam
 		}
 	}
 
-	public class SquareNavViewItem : ObservableObject
+	// TODO: Should move to a general place to use in the Settings Dialog as well
+	public class NavigationViewItemButtonStyleItem : ObservableObject
 	{
 		public string Name;
 
@@ -388,6 +405,13 @@ public bool IsSelected
 			get => _isSelected;
 			set => SetProperty(ref _isSelected, value);
 		}
+
+		private bool _isCompact;
+		public bool IsCompact
+		{
+			get => _isCompact;
+			set => SetProperty(ref _isCompact, value);
+		}
 	}
 
 	public enum PropertyNavigationViewItemEnums