diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index d3b77613cf..bb8cd10320 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -422,8 +422,8 @@ EResize
 ERole
 ERRORIMAGE
 ERRORTITLE
+erwrite
 ESettings
-esize
 esrp
 etl
 ETW
diff --git a/src/modules/imageresizer/ui/Models/ResizeFit.cs b/src/modules/imageresizer/ui/Models/ResizeFit.cs
index 74073f1ea0..6f880114a9 100644
--- a/src/modules/imageresizer/ui/Models/ResizeFit.cs
+++ b/src/modules/imageresizer/ui/Models/ResizeFit.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brice Lambson
 // The Brice Lambson licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+// See the LICENSE file in the project root for more information.
+// Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
 
 namespace ImageResizer.Models
 {
diff --git a/src/modules/imageresizer/ui/Models/ResizeSize.cs b/src/modules/imageresizer/ui/Models/ResizeSize.cs
index 761f59adf2..e200d729c9 100644
--- a/src/modules/imageresizer/ui/Models/ResizeSize.cs
+++ b/src/modules/imageresizer/ui/Models/ResizeSize.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brice Lambson
 // The Brice Lambson licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+// See the LICENSE file in the project root for more information.
+// Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
 
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/modules/imageresizer/ui/Models/ResizeUnit.cs b/src/modules/imageresizer/ui/Models/ResizeUnit.cs
index f3c6a59dc2..13ef1f63df 100644
--- a/src/modules/imageresizer/ui/Models/ResizeUnit.cs
+++ b/src/modules/imageresizer/ui/Models/ResizeUnit.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brice Lambson
 // The Brice Lambson licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+// See the LICENSE file in the project root for more information.
+// Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
 
 namespace ImageResizer.Models
 {
diff --git a/src/modules/imageresizer/ui/Properties/Resources.Designer.cs b/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
index 3b0ac8807b..4d89835deb 100644
--- a/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
+++ b/src/modules/imageresizer/ui/Properties/Resources.Designer.cs
@@ -87,15 +87,6 @@ namespace ImageResizer.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to H.
-        /// </summary>
-        public static string HeightChar {
-            get {
-                return ResourceManager.GetString("HeightChar", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Image Resizer.
         /// </summary>
@@ -142,7 +133,7 @@ namespace ImageResizer.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Ign_ore the orientation of pictures.
+        ///   Looks up a localized string similar to Ignore the _orientation of pictures.
         /// </summary>
         public static string Input_IgnoreOrientation {
             get {
@@ -151,7 +142,7 @@ namespace ImageResizer.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Remove metadata that doesn&apos;t affect rendering.
+        ///   Looks up a localized string similar to Remove meta_data that doesn&apos;t affect rendering.
         /// </summary>
         public static string Input_RemoveMetadata {
             get {
@@ -160,7 +151,7 @@ namespace ImageResizer.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to R_esize the original pictures (don&apos;t create copies).
+        ///   Looks up a localized string similar to Over_write files.
         /// </summary>
         public static string Input_Replace {
             get {
@@ -519,15 +510,6 @@ namespace ImageResizer.Properties {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to Times Symbol.
-        /// </summary>
-        public static string Times_Symbol {
-            get {
-                return ResourceManager.GetString("Times_Symbol", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Unit.
         /// </summary>
@@ -563,14 +545,5 @@ namespace ImageResizer.Properties {
                 return ResourceManager.GetString("Width", resourceCulture);
             }
         }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to W.
-        /// </summary>
-        public static string WidthChar {
-            get {
-                return ResourceManager.GetString("WidthChar", resourceCulture);
-            }
-        }
     }
 }
diff --git a/src/modules/imageresizer/ui/Properties/Resources.resx b/src/modules/imageresizer/ui/Properties/Resources.resx
index 50ee6864ec..313db96558 100644
--- a/src/modules/imageresizer/ui/Properties/Resources.resx
+++ b/src/modules/imageresizer/ui/Properties/Resources.resx
@@ -140,13 +140,13 @@
     <value>Custom</value>
   </data>
   <data name="Input_IgnoreOrientation" xml:space="preserve">
-    <value>Ign_ore the orientation of pictures</value>
+    <value>Ignore the _orientation of pictures</value>
   </data>
   <data name="Input_GifWarning" xml:space="preserve">
     <value>Gif files with animations may not be correctly resized.</value>
   </data>
   <data name="Input_Replace" xml:space="preserve">
-    <value>R_esize the original pictures (don't create copies)</value>
+    <value>Ov_erwrite files</value>
   </data>
   <data name="Input_Resize" xml:space="preserve">
     <value>Resize</value>
@@ -189,33 +189,43 @@
   </data>
   <data name="Progress_TimeRemaining_HourMinute" xml:space="preserve">
     <value>About {0} hour, {1} minute remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_HourMinutes" xml:space="preserve">
     <value>About {0} hour, {1} minutes remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_HoursMinute" xml:space="preserve">
     <value>About {0} hours, {1} minute remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_HoursMinutes" xml:space="preserve">
     <value>About {0} hours, {1} minutes remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_MinuteSecond" xml:space="preserve">
     <value>About {1} minute, {2} second remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_MinuteSeconds" xml:space="preserve">
     <value>About {1} minute, {2} seconds remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_MinutesSecond" xml:space="preserve">
     <value>About {1} minutes, {2} second remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_MinutesSeconds" xml:space="preserve">
     <value>About {1} minutes, {2} seconds remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_Second" xml:space="preserve">
     <value>About {2} second remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="Progress_TimeRemaining_Seconds" xml:space="preserve">
     <value>About {2} seconds remaining.</value>
+    <comment>"About" = Approximately, not "on the subject of"</comment>
   </data>
   <data name="ResizeFit_Fill" xml:space="preserve">
     <value>Fill</value>
@@ -262,9 +272,6 @@
   <data name="Small" xml:space="preserve">
     <value>Small</value>
   </data>
-  <data name="Times_Symbol" xml:space="preserve">
-    <value>Times Symbol</value>
-  </data>
   <data name="Unit" xml:space="preserve">
     <value>Unit</value>
   </data>
@@ -281,14 +288,6 @@
     <value>Settings</value>
   </data>
   <data name="Input_RemoveMetadata" xml:space="preserve">
-    <value>Remove metadata that doesn't affect rendering</value>
-  </data>
-  <data name="HeightChar" xml:space="preserve">
-    <value>H</value>
-    <comment>First character of 'Height'</comment>
-  </data>
-  <data name="WidthChar" xml:space="preserve">
-    <value>W</value>
-    <comment>First character of 'Width'</comment>
+    <value>Remove meta_data that doesn't affect rendering</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs b/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs
index 5290e28573..7466ec45b1 100644
--- a/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs
+++ b/src/modules/imageresizer/ui/ViewModels/InputViewModel.cs
@@ -57,9 +57,9 @@ namespace ImageResizer.ViewModels
 
         public Settings Settings { get; }
 
-        public IEnumerable<ResizeFit> ResizeFitValues { get => Enum.GetValues(typeof(ResizeFit)).Cast<ResizeFit>(); }
+        public IEnumerable<ResizeFit> ResizeFitValues => Enum.GetValues(typeof(ResizeFit)).Cast<ResizeFit>();
 
-        public IEnumerable<ResizeUnit> ResizeUnitValues { get => Enum.GetValues(typeof(ResizeUnit)).Cast<ResizeUnit>(); }
+        public IEnumerable<ResizeUnit> ResizeUnitValues => Enum.GetValues(typeof(ResizeUnit)).Cast<ResizeUnit>();
 
         public ICommand ResizeCommand { get; }
 
@@ -69,14 +69,9 @@ namespace ImageResizer.ViewModels
 
         public ICommand EnterKeyPressedCommand { get; private set; }
 
-        public bool TryingToResizeGifFiles
-        {
-            get
-            {
-                // Any of the files is a gif.
-                return _batch.Files.Any(filename => filename.EndsWith(".gif", System.StringComparison.InvariantCultureIgnoreCase));
-            }
-        }
+        // Any of the files is a gif
+        public bool TryingToResizeGifFiles =>
+                _batch.Files.Any(filename => filename.EndsWith(".gif", System.StringComparison.InvariantCultureIgnoreCase));
 
         public void Resize()
         {
diff --git a/src/modules/imageresizer/ui/Views/EnumValueConverter.cs b/src/modules/imageresizer/ui/Views/EnumValueConverter.cs
index efe421ff56..c95b69b295 100644
--- a/src/modules/imageresizer/ui/Views/EnumValueConverter.cs
+++ b/src/modules/imageresizer/ui/Views/EnumValueConverter.cs
@@ -1,6 +1,7 @@
 // Copyright (c) Brice Lambson
 // The Brice Lambson licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+// See the LICENSE file in the project root for more information.
+// Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
 
 using System;
 using System.Globalization;
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml b/src/modules/imageresizer/ui/Views/InputPage.xaml
index b38879f0ba..f219c830c8 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml
@@ -9,15 +9,16 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
+            <!--  ComboBox  -->
             <RowDefinition Height="*" />
+            <!--  other controls  -->
         </Grid.RowDefinitions>
 
         <ComboBox
-            x:Name="SizeComboBox"
-            Grid.Row="1"
+            Name="SizeComboBox"
+            Grid.Row="0"
             Height="64"
-            Margin="16,16,16,24"
+            Margin="16"
             HorizontalAlignment="Stretch"
             VerticalAlignment="Stretch"
             VerticalContentAlignment="Stretch"
@@ -25,43 +26,30 @@
             SelectedIndex="{Binding Settings.SelectedSizeIndex}">
             <ComboBox.Resources>
                 <DataTemplate DataType="{x:Type m:ResizeSize}">
-                    <Grid
-                        Margin="2,0,0,0"
-                        VerticalAlignment="Center"
-                        AutomationProperties.Name="{Binding Name}">
+                    <Grid VerticalAlignment="Center" AutomationProperties.Name="{Binding Name}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <TextBlock FontWeight="SemiBold" Text="{Binding Name}" />
-                        <StackPanel
-                            Grid.Row="1"
-                            VerticalAlignment="Top"
-                            Orientation="Horizontal">
-                            <TextBlock
-                                FontSize="12"
-                                Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                                Text="{Binding Fit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ThirdPersonSingular}" />
+                        <TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{Binding Name}" />
+                        <StackPanel Grid.Row="1" Orientation="Horizontal">
+                            <TextBlock Foreground="{DynamicResource TextFillColorSecondaryBrush}" Text="{Binding Fit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ThirdPersonSingular}" />
                             <TextBlock
                                 Margin="4,0,0,0"
-                                FontSize="12"
-                                FontWeight="SemiBold"
+                                Style="{StaticResource BodyStrongTextBlockStyle}"
                                 Text="{Binding Width, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}" />
                             <TextBlock
                                 Margin="4,0,0,0"
-                                FontSize="12"
                                 Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                 Text="×"
                                 Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}" />
                             <TextBlock
                                 Margin="4,0,0,0"
-                                FontSize="12"
-                                FontWeight="SemiBold"
+                                Style="{StaticResource BodyStrongTextBlockStyle}"
                                 Text="{Binding Height, Converter={StaticResource AutoDoubleConverter}, ConverterParameter=Auto}"
                                 Visibility="{Binding ShowHeight, Converter={StaticResource BoolValueConverter}}" />
                             <TextBlock
                                 Margin="4,0,0,0"
-                                FontSize="12"
                                 Foreground="{DynamicResource TextFillColorSecondaryBrush}"
                                 Text="{Binding Unit, Converter={StaticResource EnumValueConverter}, ConverterParameter=ToLower}" />
                         </StackPanel>
@@ -76,7 +64,7 @@
             </ComboBox.Resources>
         </ComboBox>
 
-        <Grid Grid.Row="2">
+        <Grid Grid.Row="1">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
@@ -90,15 +78,13 @@
                 BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
                 BorderThickness="0,1,0,0" />
 
-            <Grid
-                Height="86"
-                Margin="18,16,16,16"
-                Visibility="{Binding ElementName=SizeComboBox, Path=SelectedValue, Converter={StaticResource SizeTypeToVisibilityConverter}}">
+            <!--  "Custom" input matrix  -->
+            <Grid Margin="16" Visibility="{Binding ElementName=SizeComboBox, Path=SelectedValue, Converter={StaticResource SizeTypeToVisibilityConverter}}">
                 <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="24" />
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="24" />
-                    <ColumnDefinition Width="20" />
+                    <ColumnDefinition Width="24" />
                     <ColumnDefinition Width="*" />
                 </Grid.ColumnDefinitions>
                 <Grid.RowDefinitions>
@@ -107,19 +93,17 @@
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
 
-
-                <TextBlock
-                    HorizontalAlignment="Left"
+                <ui:SymbolIcon
                     VerticalAlignment="Center"
                     AutomationProperties.Name="{x:Static p:Resources.Width}"
-                    FontSize="12"
-                    FontWeight="SemiBold"
+                    FontSize="20"
                     Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                    Text="{x:Static p:Resources.WidthChar}"
+                    Symbol="AutoFitWidth20"
                     ToolTipService.ToolTip="{x:Static p:Resources.Width}" />
                 <ui:NumberBox
                     Name="WidthNumberBox"
                     Grid.Column="1"
+                    Margin="8,0,0,0"
                     HorizontalAlignment="Stretch"
                     AutomationProperties.Name="{x:Static p:Resources.Width}"
                     KeyDown="Button_KeyDown"
@@ -133,20 +117,20 @@
                             UpdateSourceTrigger="PropertyChanged" />
                     </ui:NumberBox.Value>
                 </ui:NumberBox>
-                <TextBlock
+
+                <ui:SymbolIcon
                     Grid.Column="3"
-                    HorizontalAlignment="Left"
                     VerticalAlignment="Center"
                     AutomationProperties.Name="{x:Static p:Resources.Height}"
-                    FontSize="12"
-                    FontWeight="SemiBold"
+                    FontSize="20"
                     Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                    Text="{x:Static p:Resources.HeightChar}"
+                    Symbol="AutoFitHeight20"
                     ToolTipService.ToolTip="{x:Static p:Resources.Height}"
                     Visibility="{Binding ElementName=SizeComboBox, Path=SelectedValue.ShowHeight, Converter={StaticResource BoolValueConverter}}" />
                 <ui:NumberBox
                     Name="HeightNumberBox"
                     Grid.Column="4"
+                    Margin="8,0,0,0"
                     HorizontalAlignment="Stretch"
                     AutomationProperties.Name="{x:Static p:Resources.Height}"
                     DataContext="{Binding ElementName=SizeComboBox, Path=SelectedItem}"
@@ -154,7 +138,6 @@
                     Minimum="0"
                     SpinButtonPlacementMode="Inline"
                     Visibility="{Binding ElementName=SizeComboBox, Path=SelectedValue.ShowHeight, Converter={StaticResource BoolValueConverter}}">
-
                     <ui:NumberBox.Value>
                         <Binding
                             ElementName="SizeComboBox"
@@ -166,26 +149,22 @@
 
                 <ui:SymbolIcon
                     Grid.Row="2"
-                    Margin="-2,0,0,0"
-                    HorizontalAlignment="Left"
                     VerticalAlignment="Center"
+                    FontSize="20"
                     Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                    Symbol="ArrowMaximize16"
+                    Symbol="Crop20"
                     ToolTipService.ToolTip="{x:Static p:Resources.Resize_Type}" />
-
                 <ComboBox
                     Grid.Row="2"
                     Grid.Column="1"
+                    Margin="8,0,0,0"
                     HorizontalAlignment="Stretch"
                     AutomationProperties.Name="{x:Static p:Resources.Resize_Type}"
                     ItemsSource="{Binding ResizeFitValues, Mode=OneWay}"
                     SelectedIndex="{Binding ElementName=SizeComboBox, Path=SelectedValue.Fit, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                     <ComboBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type m:ResizeFit}">
-                            <TextBlock
-                                Margin="4,0,0,0"
-                                FontSize="14"
-                                Text="{Binding {}, Converter={StaticResource EnumValueConverter}}" />
+                            <TextBlock Padding="2,0" Text="{Binding {}, Converter={StaticResource EnumValueConverter}}" />
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
@@ -193,76 +172,75 @@
                 <ui:SymbolIcon
                     Grid.Row="2"
                     Grid.Column="3"
-                    Margin="-2,0,0,0"
-                    HorizontalAlignment="Left"
                     VerticalAlignment="Center"
-                    FontSize="18"
+                    FontSize="20"
                     Foreground="{DynamicResource TextFillColorSecondaryBrush}"
-                    Symbol="Ruler16"
+                    Symbol="Ruler20"
                     ToolTipService.ToolTip="{x:Static p:Resources.Unit}" />
-
                 <ComboBox
                     Grid.Row="2"
                     Grid.Column="4"
+                    Margin="8,0,0,0"
                     AutomationProperties.Name="{x:Static p:Resources.Unit}"
                     ItemsSource="{Binding ResizeUnitValues, Mode=OneWay}"
                     SelectedIndex="{Binding ElementName=SizeComboBox, Path=SelectedValue.Unit, Mode=TwoWay, Converter={StaticResource EnumToIntConverter}}">
                     <ComboBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type m:ResizeUnit}">
-                            <TextBlock
-                                Margin="4,0,0,0"
-                                FontSize="14"
-                                Text="{Binding {}, Converter={StaticResource EnumValueConverter}}" />
+                            <TextBlock Padding="2,0" Text="{Binding {}, Converter={StaticResource EnumValueConverter}}" />
                         </DataTemplate>
                     </ComboBox.ItemTemplate>
                 </ComboBox>
-
             </Grid>
 
+            <!--  CheckBoxes  -->
             <StackPanel
                 Grid.Row="1"
-                VerticalAlignment="Top"
+                Margin="16"
                 Orientation="Vertical">
+                <CheckBox IsChecked="{Binding Settings.ShrinkOnly}">
+                    <CheckBox.Content>
+                        <AccessText Text="{x:Static p:Resources.Input_ShrinkOnly}" TextWrapping="Wrap" />
+                    </CheckBox.Content>
+                </CheckBox>
 
-                <CheckBox
-                    Margin="16,12,16,0"
-                    Content="{x:Static p:Resources.Input_ShrinkOnly}"
-                    IsChecked="{Binding Settings.ShrinkOnly}" />
+                <CheckBox IsChecked="{Binding Settings.IgnoreOrientation}">
+                    <CheckBox.Content>
+                        <AccessText Text="{x:Static p:Resources.Input_IgnoreOrientation}" TextWrapping="Wrap" />
+                    </CheckBox.Content>
+                </CheckBox>
 
-                <CheckBox
-                    Margin="16,2,16,0"
-                    Content="{x:Static p:Resources.Input_IgnoreOrientation}"
-                    IsChecked="{Binding Settings.IgnoreOrientation}" />
-                <!--
-                    TODO: This option doesn't make much sense when resizing into a directory. We should swap it for an option
-                    to overwrite any files in the directory instead (issue #88)
-                -->
-                <CheckBox
-                    Margin="16,2,16,0"
-                    Content="{x:Static p:Resources.Input_Replace}"
-                    IsChecked="{Binding Settings.Replace}" />
+                <CheckBox IsChecked="{Binding Settings.Replace}">
+                    <CheckBox.Content>
+                        <AccessText Text="{x:Static p:Resources.Input_Replace}" TextWrapping="Wrap" />
+                    </CheckBox.Content>
+                </CheckBox>
 
-                <CheckBox
-                    Margin="16,2,16,0"
-                    Content="{x:Static p:Resources.Input_RemoveMetadata}"
-                    IsChecked="{Binding Settings.RemoveMetadata}" />
+                <CheckBox IsChecked="{Binding Settings.RemoveMetadata}">
+                    <CheckBox.Content>
+                        <AccessText Text="{x:Static p:Resources.Input_RemoveMetadata}" TextWrapping="Wrap" />
+                    </CheckBox.Content>
+                </CheckBox>
             </StackPanel>
 
+
+            <!--  Separator line  -->
             <Border
                 Grid.Row="2"
                 Height="1"
-                Margin="0,12,0,8"
+                Margin="0,8"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Top"
                 Background="{DynamicResource DividerStrokeColorDefaultBrush}" />
+
             <ui:InfoBar
                 Grid.Row="3"
-                Margin="16,0,16,0"
-                Padding="12,8,8,8"
+                Margin="16,0"
                 IsClosable="False"
                 IsOpen="{Binding TryingToResizeGifFiles}"
                 Message="{x:Static p:Resources.Input_GifWarning}"
                 Severity="Warning" />
+
+            <!--  Buttons  -->
             <Grid Grid.Row="4" Margin="16,8,16,16">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition />
@@ -271,30 +249,26 @@
                 </Grid.ColumnDefinitions>
 
                 <ui:Button
-                    Width="36"
-                    Height="36"
-                    Margin="-6,0,0,0"
                     Padding="0"
-                    HorizontalAlignment="Left"
                     AutomationProperties.Name="{x:Static p:Resources.Open_settings}"
                     Background="Transparent"
                     BorderBrush="Transparent"
                     Command="{Binding OpenSettingsCommand}"
                     ToolTipService.ToolTip="{x:Static p:Resources.Open_settings}">
                     <ui:Button.Content>
-                        <ui:SymbolIcon FontSize="18" Symbol="Settings20" />
+                        <ui:SymbolIcon FontSize="20" Symbol="Settings20" />
                     </ui:Button.Content>
                 </ui:Button>
+
                 <ui:Button
                     Grid.Column="1"
                     MinWidth="76"
-                    Margin="8,0,0,0"
                     Appearance="Primary"
                     AutomationProperties.Name="{x:Static p:Resources.Resize_Tooltip}"
                     Command="{Binding ResizeCommand}"
                     IsDefault="True">
                     <StackPanel Orientation="Horizontal">
-                        <ui:SymbolIcon FontSize="18" Symbol="ResizeImage20" />
+                        <ui:SymbolIcon FontSize="16" Symbol="ResizeLarge16" />
                         <TextBlock Margin="8,0,0,0" Text="{x:Static p:Resources.Input_Resize}" />
                     </StackPanel>
                 </ui:Button>
@@ -307,8 +281,6 @@
                     Content="{x:Static p:Resources.Cancel}"
                     IsCancel="True" />
             </Grid>
-
-
         </Grid>
     </Grid>
 </UserControl>
diff --git a/src/modules/imageresizer/ui/Views/InputPage.xaml.cs b/src/modules/imageresizer/ui/Views/InputPage.xaml.cs
index c22f74bdc2..4999e2610f 100644
--- a/src/modules/imageresizer/ui/Views/InputPage.xaml.cs
+++ b/src/modules/imageresizer/ui/Views/InputPage.xaml.cs
@@ -1,13 +1,13 @@
 // Copyright (c) Brice Lambson
 // The Brice Lambson licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
+// See the LICENSE file in the project root for more information.
+// Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
 
 using System.Windows.Controls;
 using System.Windows.Input;
 using ImageResizer.ViewModels;
 using Wpf.Ui.Controls;
 using static ImageResizer.ViewModels.InputViewModel;
-using Numberbox = Wpf.Ui.Controls.NumberBox;
 
 namespace ImageResizer.Views
 {
@@ -29,10 +29,9 @@ namespace ImageResizer.Views
             if (e.Key == Key.Enter)
             {
                 var numberBox = sender as NumberBox;
-                var viewModel = (InputViewModel)this.DataContext;
-                double number;
+                var viewModel = (InputViewModel)DataContext;
                 KeyPressParams keyParams;
-                if (double.TryParse(((System.Windows.Controls.TextBox)e.OriginalSource).Text, out number))
+                if (double.TryParse(((System.Windows.Controls.TextBox)e.OriginalSource).Text, out double number))
                 {
                     // Determine which NumberBox triggered the event based on its name
                     switch (numberBox.Name)
diff --git a/src/modules/imageresizer/ui/Views/MainWindow.xaml b/src/modules/imageresizer/ui/Views/MainWindow.xaml
index 72a5120710..2ca6ca6b6c 100644
--- a/src/modules/imageresizer/ui/Views/MainWindow.xaml
+++ b/src/modules/imageresizer/ui/Views/MainWindow.xaml
@@ -16,6 +16,7 @@
     ExtendsContentIntoTitleBar="True"
     Icon="/PowerToys.ImageResizer;component/Resources/ImageResizer.ico"
     ResizeMode="NoResize"
+    SizeToContent="Height"
     WindowCornerPreference="Default"
     WindowStartupLocation="CenterScreen">
 
@@ -58,6 +59,7 @@
                 <ui:ImageIcon Source="/PowerToys.ImageResizer;component/Resources/ImageResizer.ico" />
             </ui:TitleBar.Icon>
         </ui:TitleBar>
+
         <ContentPresenter Grid.Row="1" Content="{Binding CurrentPage}" />
     </Grid>
 </ui:FluentWindow>
diff --git a/src/modules/imageresizer/ui/Views/ResizeUnitConverter.cs b/src/modules/imageresizer/ui/Views/ResizeUnitConverter.cs
deleted file mode 100644
index 5484c3c468..0000000000
--- a/src/modules/imageresizer/ui/Views/ResizeUnitConverter.cs
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) Brice Lambson
-// The Brice Lambson licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.  Code forked from Brice Lambson's https://github.com/bricelam/ImageResizer/
-
-using System;
-using System.Globalization;
-using System.Windows.Data;
-using ImageResizer.Models;
-using ImageResizer.Properties;
-
-namespace ImageResizer.Views
-{
-    [ValueConversion(typeof(ResizeUnit), typeof(string))]
-    internal class ResizeUnitConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            var output = Resources.ResourceManager.GetString(Enum.GetName(typeof(ResizeUnit), value), culture);
-
-            if ((string)parameter == "ToLower")
-            {
-                output = output.ToLower(culture);
-            }
-
-            return output;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            => throw new NotImplementedException();
-    }
-}
diff --git a/src/modules/imageresizer/ui/Views/ResultsPage.xaml b/src/modules/imageresizer/ui/Views/ResultsPage.xaml
index 9f010df456..e84906879d 100644
--- a/src/modules/imageresizer/ui/Views/ResultsPage.xaml
+++ b/src/modules/imageresizer/ui/Views/ResultsPage.xaml
@@ -9,11 +9,7 @@
             Margin="12,12,12,0"
             FontSize="16"
             Text="{x:Static p:Resources.Results_MainInstruction}" />
-        <ScrollViewer
-            MaxWidth="363"
-            MaxHeight="350"
-            HorizontalAlignment="Stretch"
-            VerticalScrollBarVisibility="Auto">
+        <ScrollViewer HorizontalAlignment="Stretch" VerticalScrollBarVisibility="Auto">
             <ItemsControl Margin="12,4,12,0" ItemsSource="{Binding Errors}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate DataType="ResizeError">
@@ -28,11 +24,12 @@
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
         </ScrollViewer>
+
         <Border
             Margin="0,12,0,0"
             Padding="12,12"
             Background="{DynamicResource LayerFillColorDefaultBrush}"
-            BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
+            BorderBrush="{DynamicResource DividerStrokeColorDefaultBrush}"
             BorderThickness="0,1,0,0">
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button
diff --git a/src/modules/imageresizer/ui/Views/SizeTypeToVisibilityConverter.cs b/src/modules/imageresizer/ui/Views/SizeTypeToVisibilityConverter.cs
index 5a53c0c5af..a30e257d84 100644
--- a/src/modules/imageresizer/ui/Views/SizeTypeToVisibilityConverter.cs
+++ b/src/modules/imageresizer/ui/Views/SizeTypeToVisibilityConverter.cs
@@ -15,21 +15,7 @@ namespace ImageResizer.Views
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value != null)
-            {
-                if (value.GetType() == typeof(CustomSize))
-                {
-                    return Visibility.Visible;
-                }
-                else
-                {
-                    return Visibility.Collapsed;
-                }
-            }
-            else
-            {
-                return Visibility.Collapsed;
-            }
+            return value != null && value.GetType() == typeof(CustomSize) ? Visibility.Visible : (object)Visibility.Collapsed;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)