Fixed: As Many UI Issues as I can Handle

src/Examples/TreeDataGrid/SingleColumn/FileColumn/FileColumnView.axaml

@@ -13,7 +13,6 @@
     <Grid ColumnDefinitions="*, Auto" Margin="0,5,0,5">
         <Grid.Styles>
             <Style Selector="icons|UnifiedIcon.FileTypeIcon">
-                <Setter Property="Size" Value="18" />
                 <Setter Property="Margin" Value="8, 0, 0, 0" />
             </Style>
 

src/Games/NexusMods.Games.AdvancedInstaller.UI/Content/Left/ModContent/TreeEntry/ModContentTreeEntryView.axaml

@@ -16,14 +16,9 @@
     <Grid ColumnDefinitions="*, Auto" Margin="0,5,0,5">
         <Grid.Styles>
             <Style Selector="icons|UnifiedIcon.FileTypeIcon">
-                <Setter Property="Size" Value="18" />
                 <Setter Property="Margin" Value="8, 0, 0, 0" />
             </Style>
 
-            <Style Selector="icons|UnifiedIcon.Close">
-                <Setter Property="Size" Value="20" />
-            </Style>
-
             <Style Selector="Button.RightElements">
                 <Setter Property="Margin" Value="0,0,8,0" />
             </Style>

src/Games/NexusMods.Games.AdvancedInstaller.UI/Content/Right/Preview/TreeEntry/PreviewTreeEntryView.axaml

@@ -16,7 +16,6 @@
     <Grid ColumnDefinitions="*, Auto" Margin="0,5,0,5">
         <Grid.Styles>
             <Style Selector="icons|UnifiedIcon.FileTypeIcon">
-                <Setter Property="Size" Value="18" />
                 <Setter Property="Margin" Value="8, 0, 8, 0" />
             </Style>
 

src/Games/NexusMods.Games.AdvancedInstaller.UI/Content/Right/SelectLocation/SuggestedEntry/SuggestedEntryView.axaml

@@ -16,7 +16,6 @@
     <Grid ColumnDefinitions="Auto, *, Auto">
         <Grid.Styles>
             <Style Selector="icons|UnifiedIcon.FileTypeIcon">
-                <Setter Property="Size" Value="18" />
                 <Setter Property="Margin" Value="8, 0, 8, 0" />
             </Style>
 

src/Games/NexusMods.Games.AdvancedInstaller.UI/Content/Right/SelectLocation/TreeEntry/SelectableTreeEntryView.axaml

@@ -17,7 +17,6 @@
     <Grid ColumnDefinitions="*, Auto" Margin="0,5,0,5">
         <Grid.Styles>
             <Style Selector="icons|UnifiedIcon.FileTypeIcon">
-                <Setter Property="Size" Value="18" />
                 <Setter Property="Margin" Value="8, 0, 8, 0" />
             </Style>
 

src/Games/NexusMods.Games.FOMOD.UI/Options/GuidedInstallerOptionView.axaml

@@ -12,6 +12,13 @@
     <Design.DataContext>
         <ui:GuidedInstallerOptionDesignViewModel />
     </Design.DataContext>
+
+    <reactiveUi:ReactiveUserControl.Styles>
+        <!-- Match Icon Size with Design -->
+        <Style Selector="Border#SelectionHighlightBorder icons|UnifiedIcon">
+            <Setter Property="Size" Value="24" />
+        </Style>
+    </reactiveUi:ReactiveUserControl.Styles>
 
     <Border x:Name="OptionContainerBorder" Classes="OptionBorder">
         <Grid ColumnDefinitions="Auto, *" RowDefinitions="Auto">
@@ -24,7 +31,7 @@
                     <TextBlock Grid.Column="0" Classes="BodyMDNormal" x:Name="OptionNameTextBlock"
                                VerticalAlignment="Center" />
                     <icons:UnifiedIcon Classes="Image" IsVisible="False" Grid.Column="1" x:Name="ImageIcon"
-                                VerticalAlignment="Center" />
+                                VerticalAlignment="Center"  />
                     <icons:UnifiedIcon Classes="Description" IsVisible="False" Grid.Column="2" x:Name="DescriptionIcon"
                                 VerticalAlignment="Center" />
                 </Grid>

src/NexusMods.App.UI/Controls/DataGrid/Helpers.cs

@@ -26,7 +26,9 @@ private static void GenerateColumnsImpl<TColumnType>(Avalonia.Controls.DataGrid
         foreach (var column in columns)
         {
             var generatedColumn = column.Generate();
-            generatedColumn.Header = GenerateHeader(column.Type);
+            var header = GenerateHeader(column.Type);
+            generatedColumn.Header = header;
+            generatedColumn.MinWidth = header.MinWidth;
             target.Columns.Add(generatedColumn);
         }
     }
@@ -42,6 +44,9 @@ private static Control GenerateHeader<TColumnType>(this TColumnType column) wher
                 LoadoutColumn.Category => new TextBlock { Text = Language.Helpers_GenerateHeader_CATEGORY },
                 LoadoutColumn.Installed => new TextBlock { Text = Language.Helpers_GenerateHeader_INSTALLED },
                 LoadoutColumn.Enabled => new ModEnabledHeader()
+                {
+                    MinWidth = 65,
+                }
             },
             DownloadColumn downloadColumn => downloadColumn switch
             {

src/NexusMods.App.UI/Controls/GameWidget/GameWidget.axaml

@@ -65,7 +65,7 @@
                             IsVisible="False">
                             <Button Classes="Rounded Primary" x:Name="AddGameButton">
                                 <StackPanel Orientation="Horizontal">
-                                    <icons:UnifiedIcon Size="20" Classes="Add" />
+                                    <icons:UnifiedIcon Classes="Add" />
                                     <TextBlock Classes="BodyMDNormal" 
                                                Text="{x:Static resources:Language.GameWidget__Add_game}"/>
                                 </StackPanel>
@@ -101,7 +101,7 @@
                                     HorizontalAlignment="Stretch"
                                     Grid.Column="0">
                                 <StackPanel Orientation="Horizontal">
-                                    <icons:UnifiedIcon Size="20" Classes="Check" />
+                                    <icons:UnifiedIcon Classes="Check" />
                                     <TextBlock Classes="BodyMDNormal" 
                                                Text="{x:Static resources:Language.GameWidget__View}"/>
                                 </StackPanel>

src/NexusMods.App.UI/Controls/TopBar/TopBarView.axaml

@@ -49,9 +49,9 @@
                     <TextBlock Text="{x:Static resources:Language.TopBar_Help_ToolTip}" />
                 </ToolTip.Tip>
                 <MenuItem.Header>
-                    <StackPanel Orientation="Horizontal" Spacing="0" Margin="10">
-                        <icons:UnifiedIcon Classes="Help" Size="20" />
-                        <icons:UnifiedIcon Classes="MenuDown" Size="24"/>
+                    <StackPanel Orientation="Horizontal" Spacing="0" Margin="10, 0 , 10,  0">
+                        <icons:UnifiedIcon Classes="Help"/>
+                        <icons:UnifiedIcon Classes="MenuDown"/>
                     </StackPanel>
                 </MenuItem.Header>
 

src/NexusMods.App.UI/Controls/Trees/DiffTreeViewModel.cs

@@ -207,9 +207,9 @@ internal static HierarchicalTreeDataGridSource<IFileTreeNodeViewModel> CreateTre
             Columns =
             {
                 FileTreeNodeViewModel.CreateTreeSourceNameColumn(),
-                FileTreeNodeViewModel.CreateTreeSourceStateColumn(),
-                FileTreeNodeViewModel.CreateTreeSourceFileCountColumn(),
                 FileTreeNodeViewModel.CreateTreeSourceSizeColumn(),
+                FileTreeNodeViewModel.CreateTreeSourceFileCountColumn(),
+                FileTreeNodeViewModel.CreateTreeSourceStateColumn(),
             },
         };
     }

src/NexusMods.App.UI/Controls/Trees/FileTreeView.axaml

@@ -38,7 +38,7 @@
                     <files:FileTreeNodeView DataContext="{CompiledBinding}" />
                 </DataTemplate>
                 <DataTemplate x:Key="FileStateColumnTemplate" DataType="{x:Type files:IFileTreeNodeViewModel}">
-                    <TextBlock Text="{CompiledBinding FormattedChangeState}" >
+                    <TextBlock Text="{CompiledBinding FormattedChangeState}" VerticalAlignment="Center" >
                         <ToolTip.Tip>
                             <TextBlock Text="{CompiledBinding FormattedChangeStateToolTip}" />
                         </ToolTip.Tip>

src/NexusMods.App.UI/Controls/Trees/Files/FileTreeNodeView.axaml

@@ -14,7 +14,6 @@
     <Grid ColumnDefinitions="*, Auto" Margin="0,5,0,5">
         <Grid.Styles>
             <Style Selector="icons|UnifiedIcon.FileTypeIcon">
-                <Setter Property="Size" Value="18" />
                 <Setter Property="Margin" Value="8, 0, 0, 0" />
             </Style>
 

src/NexusMods.App.UI/Controls/Trees/ModFileTreeViewModel.cs

@@ -183,8 +183,8 @@ internal static HierarchicalTreeDataGridSource<IFileTreeNodeViewModel> CreateTre
             Columns =
             {
                 FileTreeNodeViewModel.CreateTreeSourceNameColumn(),
-                FileTreeNodeViewModel.CreateTreeSourceFileCountColumn(),
                 FileTreeNodeViewModel.CreateTreeSourceSizeColumn(),
+                FileTreeNodeViewModel.CreateTreeSourceFileCountColumn(),
             },
         };
     }

src/NexusMods.App.UI/LeftMenu/Home/HomeLeftMenuViewModel.cs

@@ -28,7 +28,7 @@ public HomeLeftMenuViewModel(
             new IconViewModel
             {
                 Name = Language.MyGames,
-                Icon = IconValues.JoystickGameFilled,
+                Icon = IconValues.Game,
                 NavigateCommand = ReactiveCommand.Create<NavigationInformation>(info =>
                 {
                     var pageData = new PageData

src/NexusMods.App.UI/LeftMenu/Items/IconView.axaml

@@ -24,7 +24,7 @@
                                   Height="36"
                                   Padding="8,0,8,0">
         <Grid ColumnDefinitions="Auto, *, Auto">
-            <icons:UnifiedIcon Grid.Column="0" Size="16" x:Name="LeftIcon" />
+            <icons:UnifiedIcon Grid.Column="0" x:Name="LeftIcon" />
             <TextBlock
                 Margin="8 0 0 0"
                 Grid.Column="1"

src/NexusMods.App.UI/LeftMenu/Loadout/LoadoutLeftMenuDesignViewModel.cs

@@ -24,7 +24,7 @@ public LoadoutLeftMenuDesignViewModel()
                 new IconViewModel
                 {
                     Name = "Diagnostics",
-                    Icon = IconValues.MonitorDiagnostics,
+                    Icon = IconValues.Stethoscope,
                 },
             ]
         );

src/NexusMods.App.UI/Pages/Diagnostics/Details/DiagnosticDetailsViewModel.cs

@@ -20,7 +20,7 @@ public DiagnosticDetailsViewModel(
         IMarkdownRendererViewModel markdownRendererViewModel,
         Diagnostic diagnostic) : base(windowManager)
     {
-        TabIcon = IconValues.DiagnosticPage;
+        TabIcon = IconValues.Stethoscope;
         TabTitle = diagnostic.Title;
         Severity = diagnostic.Severity;
 

src/NexusMods.App.UI/Pages/LoadoutGrid/LoadoutGridView.axaml

@@ -1,4 +1,4 @@
-<reactiveUi:ReactiveUserControl
+<reactiveUi:ReactiveUserControl
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d"
@@ -30,8 +30,8 @@
                 </navigation:NavigationControl>
                 <Button x:Name="DeleteModsButton">
                     <StackPanel>
-                        <icons:UnifiedIcon Classes="Close" />
-                        <TextBlock Text="{x:Static resources:Language.LoadoutGridView__Remove}" />
+                        <icons:UnifiedIcon Classes="PlaylistRemove" />
+                        <TextBlock Text="{x:Static resources:Language.LoadoutGridView__Remove}"/>
                     </StackPanel>
                 </Button>
             </StackPanel>