diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs
index f78fdded5d6b..1591cbbdb43d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageResizerSettings.cs
@@ -30,7 +30,11 @@ public ImageResizerSettings()
 
         public string ToJsonString()
         {
-            return JsonSerializer.Serialize(this);
+            var options = new JsonSerializerOptions
+            {
+                WriteIndented = true,
+            };
+            return JsonSerializer.Serialize(this, options);
         }
     }
 }
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs
index 43a2b9615729..491973b138e6 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI.Lib/ImageSize.cs
@@ -4,13 +4,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Microsoft.PowerToys.Settings.UI.Lib
 {
-    public class ImageSize
+    public class ImageSize : INotifyPropertyChanged
     {
         public ImageSize(int id)
         {
@@ -42,22 +44,140 @@ public ImageSize(int id, string name, ResizeFit fit, double width, double height
             Unit = (int)unit;
         }
 
-        public int Id { get; set; }
+        private int _id;
+        private string _name;
+        private int _fit;
+        private double _height;
+        private double _width;
+        private int _unit;
+
+        public int Id
+        {
+            get
+            {
+                return _id;
+            }
+
+            set
+            {
+                if (_id != value)
+                {
+                    _id = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         [JsonPropertyName("name")]
-        public string Name { get; set; }
+        public string Name
+        {
+            get
+            {
+                return _name;
+            }
+
+            set
+            {
+                if (_name != value)
+                {
+                    _name = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         [JsonPropertyName("fit")]
-        public int Fit { get; set; }
+        public int Fit
+        {
+            get
+            {
+                return _fit;
+            }
+
+            set
+            {
+                if (_fit != value)
+                {
+                    _fit = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         [JsonPropertyName("width")]
-        public double Width { get; set; }
+        public double Width
+        {
+            get
+            {
+                return _width;
+            }
+
+            set
+            {
+                if (_width != value)
+                {
+                    _width = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         [JsonPropertyName("height")]
-        public double Height { get; set; }
+        public double Height
+        {
+            get
+            {
+                return _height;
+            }
+
+            set
+            {
+                if (_height != value)
+                {
+                    _height = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
 
         [JsonPropertyName("unit")]
-        public int Unit { get; set; }
+        public int Unit
+        {
+            get
+            {
+                return _unit;
+            }
+
+            set
+            {
+                if (_unit != value)
+                {
+                    _unit = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        public void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            var handler = PropertyChanged;
+            if (handler != null)
+            {
+                handler(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+        public void Update(ImageSize modifiedSize)
+        {
+            Id = modifiedSize.Id;
+            Name = modifiedSize.Name;
+            Fit = modifiedSize.Fit;
+            Width = modifiedSize.Width;
+            Height = modifiedSize.Height;
+            Unit = modifiedSize.Unit;
+        }
 
         public string ToJsonString()
         {
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ImageResizerViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ImageResizerViewModel.cs
index 8b99d5727cd1..f94d21e3b014 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ImageResizerViewModel.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UI/ViewModels/ImageResizerViewModel.cs
@@ -6,6 +6,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Input;
@@ -53,6 +54,15 @@ public ImageResizerViewModel()
             this._tiffCompressOption = Settings.Properties.ImageresizerTiffCompressOption.Value;
             this._fileName = Settings.Properties.ImageresizerFileName.Value;
             this._keepDateModified = Settings.Properties.ImageresizerKeepDateModified.Value;
+            this._encoderGuidId = GetEncoderIndex(Settings.Properties.ImageresizerFallbackEncoder.Value);
+
+            int i = 0;
+            foreach (ImageSize size in _advancedSizes)
+            {
+                size.Id = i;
+                i++;
+                size.PropertyChanged += Size_PropertyChanged;
+            }
         }
 
         private bool _isEnabled = false;
@@ -94,12 +104,10 @@ public ObservableCollection<ImageSize> Sizes
 
             set
             {
-                if (_advancedSizes != value)
-                {
-                    _advancedSizes = value;
-                    Settings.Properties.ImageresizerSizes.Value = value;
-                    OnPropertyChanged("Sizes");
-                }
+                _advancedSizes = value;
+                Settings.Properties.ImageresizerSizes.Value = value;
+                SettingsUtils.SaveSettings(Settings.ToJsonString(), ModuleName);
+                OnPropertyChanged("Sizes");
             }
         }
 
@@ -209,43 +217,8 @@ public int Encoder
             {
                 if (_encoderGuidId != value)
                 {
-                    // PNG Encoder guid
-                    if (value == 0)
-                    {
-                        Settings.Properties.ImageresizerFallbackEncoder.Value = "1b7cfaf4-713f-473c-bbcd-6137425faeaf";
-                    }
-
-                    // Bitmap Encoder guid
-                    else if (value == 1)
-                    {
-                        Settings.Properties.ImageresizerFallbackEncoder.Value = "0af1d87e-fcfe-4188-bdeb-a7906471cbe3";
-                    }
-
-                    // JPEG Encoder guid
-                    else if (value == 2)
-                    {
-                        Settings.Properties.ImageresizerFallbackEncoder.Value = "19e4a5aa-5662-4fc5-a0c0-1758028e1057";
-                    }
-
-                    // Tiff encoder guid.
-                    else if (value == 3)
-                    {
-                        Settings.Properties.ImageresizerFallbackEncoder.Value = "163bcc30-e2e9-4f0b-961d-a3e9fdb788a3";
-                    }
-
-                    // Tiff encoder guid.
-                    else if (value == 4)
-                    {
-                        Settings.Properties.ImageresizerFallbackEncoder.Value = "57a37caa-367a-4540-916b-f183c5093a4b";
-                    }
-
-                    // Gif encoder guid.
-                    else if (value == 5)
-                    {
-                        Settings.Properties.ImageresizerFallbackEncoder.Value = "1f8a5601-7d4d-4cbd-9c82-1bc8d4eeb9a5";
-                    }
-
                     _encoderGuidId = value;
+                    Settings.Properties.ImageresizerFallbackEncoder.Value = GetEncoderGuid(value);
                     SettingsUtils.SaveSettings(Settings.ToJsonString(), ModuleName);
                     OnPropertyChanged("Encoder");
                 }
@@ -278,8 +251,12 @@ public ICommand AddImageSizeEventHandler
 
         public void AddRow()
         {
-            ImageSize maxSize = Sizes.OrderBy(x => x.Id).Last();
-            Sizes.Add(new ImageSize(maxSize.Id + 1));
+            ObservableCollection<ImageSize> imageSizes = Sizes;
+            ImageSize maxSize = imageSizes.OrderBy(x => x.Id).Last();
+            ImageSize newSize = new ImageSize(maxSize.Id + 1);
+            newSize.PropertyChanged += Size_PropertyChanged;
+            imageSizes.Add(newSize);
+            Sizes = imageSizes;
             OnPropertyChanged("Sizes");
         }
 
@@ -288,7 +265,9 @@ public void DeleteImageSize(int id)
             try
             {
                 ImageSize size = Sizes.Where<ImageSize>(x => x.Id == id).First();
-                Sizes.Remove(size);
+                ObservableCollection<ImageSize> imageSizes = Sizes;
+                imageSizes.Remove(size);
+                Sizes = imageSizes;
                 OnPropertyChanged("Sizes");
             }
             catch
@@ -298,12 +277,97 @@ public void DeleteImageSize(int id)
 
         public void SavesImageSizes()
         {
-            OnPropertyChanged("Sizes");
             SettingsUtils.SaveSettings(Settings.ToJsonString(), ModuleName);
         }
 
-        public void OnSizesCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        public string GetEncoderGuid(int value)
+        {
+            // PNG Encoder guid
+            if (value == 0)
+            {
+                return "1b7cfaf4-713f-473c-bbcd-6137425faeaf";
+            }
+
+            // Bitmap Encoder guid
+            else if (value == 1)
+            {
+                return "0af1d87e-fcfe-4188-bdeb-a7906471cbe3";
+            }
+
+            // JPEG Encoder guid
+            else if (value == 2)
+            {
+                return "19e4a5aa-5662-4fc5-a0c0-1758028e1057";
+            }
+
+            // Tiff encoder guid.
+            else if (value == 3)
+            {
+                return "163bcc30-e2e9-4f0b-961d-a3e9fdb788a3";
+            }
+
+            // Tiff encoder guid.
+            else if (value == 4)
+            {
+                return "57a37caa-367a-4540-916b-f183c5093a4b";
+            }
+
+            // Gif encoder guid.
+            else if (value == 5)
+            {
+                return "1f8a5601-7d4d-4cbd-9c82-1bc8d4eeb9a5";
+            }
+
+            return null;
+        }
+
+        public int GetEncoderIndex(string guid)
+        {
+            // PNG Encoder guid
+            if (guid == "1b7cfaf4-713f-473c-bbcd-6137425faeaf")
+            {
+                return 0;
+            }
+
+            // Bitmap Encoder guid
+            else if (guid == "0af1d87e-fcfe-4188-bdeb-a7906471cbe3")
+            {
+                return 1;
+            }
+
+            // JPEG Encoder guid
+            else if (guid == "19e4a5aa-5662-4fc5-a0c0-1758028e1057")
+            {
+                return 2;
+            }
+
+            // Tiff encoder guid.
+            else if (guid == "163bcc30-e2e9-4f0b-961d-a3e9fdb788a3")
+            {
+                return 3;
+            }
+
+            // Tiff encoder guid.
+            else if (guid == "57a37caa-367a-4540-916b-f183c5093a4b")
+            {
+                return 4;
+            }
+
+            // Gif encoder guid.
+            else if (guid == "1f8a5601-7d4d-4cbd-9c82-1bc8d4eeb9a5")
+            {
+                return 5;
+            }
+
+            return -1;
+        }
+
+        public void Size_PropertyChanged(object sender, PropertyChangedEventArgs e)
         {
+            ImageSize modifiedSize = (ImageSize)sender;
+            ObservableCollection<ImageSize> imageSizes = Sizes;
+            imageSizes.Where<ImageSize>(x => x.Id == modifiedSize.Id).First().Update(modifiedSize);
+            Sizes = imageSizes;
             OnPropertyChanged("Sizes");
         }
     }
diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
index 0178a6e06cec..f9c1ec9a549d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
+++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
@@ -53,8 +53,8 @@
             <TextBlock x:Uid="ImageResizer_EnableGroupSettingsHeader"
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
-            <ToggleSwitch x:Uid="ImageResizer_EnableToggle"
-                          IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
+            <!--x:Uid="ImageResizer_EnableToggle"-->
+            <ToggleSwitch IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
                           Margin="{StaticResource SmallTopMargin}" />
 
             <TextBlock x:Uid="ImageResizer_CustomSizes"
@@ -63,41 +63,79 @@
 
             <ListView x:Name="ImagesSizesListView" 
                       ItemsSource="{Binding Sizes, Mode=TwoWay, Source={StaticResource ViewModel}}"
-                      IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}">
+                      Padding="0"
+                      IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
+                      Margin="0"
+                      >
+
+                <ListView.ItemContainerStyle>
+                    <Style TargetType="ListViewItem">
+                        <Setter Property="FontFamily" Value="{ThemeResource ContentControlThemeFontFamily}"/>
+                        <Setter Property="FontSize" Value="{ThemeResource ControlContentThemeFontSize}"/>
+                        <Setter Property="Background" Value="{ThemeResource ListViewItemBackground}"/>
+                        <Setter Property="Foreground" Value="{ThemeResource ListViewItemForeground}"/>
+                        <Setter Property="TabNavigation" Value="Local"/>
+                        <Setter Property="IsHoldingEnabled" Value="True"/>
+                        <Setter Property="Padding" Value="0"/>
+                        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
+                        <Setter Property="VerticalContentAlignment" Value="Center"/>
+                        <Setter Property="MinWidth" Value="{ThemeResource ListViewItemMinWidth}"/>
+                        <Setter Property="MinHeight" Value="0"/>
+                        <Setter Property="AllowDrop" Value="False"/>
+                        <Setter Property="UseSystemFocusVisuals" Value="True"/>
+                        <Setter Property="FocusVisualMargin" Value="0"/>
+                        <Setter Property="FocusVisualPrimaryBrush" Value="{ThemeResource ListViewItemFocusVisualPrimaryBrush}"/>
+                        <Setter Property="FocusVisualPrimaryThickness" Value="2"/>
+                        <Setter Property="FocusVisualSecondaryBrush" Value="{ThemeResource ListViewItemFocusVisualSecondaryBrush}"/>
+                        <Setter Property="FocusVisualSecondaryThickness" Value="1"/>
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="ListViewItem">
+                                    <ListViewItemPresenter CheckBrush="{ThemeResource ListViewItemCheckBrush}" ContentMargin="{TemplateBinding Padding}" CheckMode="{ThemeResource ListViewItemCheckMode}" ContentTransitions="{TemplateBinding ContentTransitions}" CheckBoxBrush="{ThemeResource ListViewItemCheckBoxBrush}" DragForeground="{ThemeResource ListViewItemDragForeground}" DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}" DragBackground="{ThemeResource ListViewItemDragBackground}" DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}" FocusVisualPrimaryBrush="{TemplateBinding FocusVisualPrimaryBrush}" FocusVisualSecondaryThickness="{TemplateBinding FocusVisualSecondaryThickness}" FocusBorderBrush="{ThemeResource ListViewItemFocusBorderBrush}" FocusVisualMargin="{TemplateBinding FocusVisualMargin}" FocusVisualPrimaryThickness="{TemplateBinding FocusVisualPrimaryThickness}" FocusSecondaryBorderBrush="{ThemeResource ListViewItemFocusSecondaryBorderBrush}" FocusVisualSecondaryBrush="{TemplateBinding FocusVisualSecondaryBrush}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" Control.IsTemplateFocusTarget="True" PointerOverForeground="{ThemeResource ListViewItemForegroundPointerOver}" PressedBackground="{ThemeResource ListViewItemBackgroundPressed}" PlaceholderBackground="{ThemeResource ListViewItemPlaceholderBackground}" PointerOverBackground="{ThemeResource ListViewItemBackgroundPointerOver}" ReorderHintOffset="{ThemeResource ListViewItemReorderHintThemeOffset}" SelectedPressedBackground="{ThemeResource ListViewItemBackgroundSelectedPressed}" SelectionCheckMarkVisualEnabled="{ThemeResource ListViewItemSelectionCheckMarkVisualEnabled}" SelectedForeground="{ThemeResource ListViewItemForegroundSelected}" SelectedPointerOverBackground="{ThemeResource ListViewItemBackgroundSelectedPointerOver}" SelectedBackground="{ThemeResource ListViewItemBackgroundSelected}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+
+                </ListView.ItemContainerStyle>
                 <ListView.ItemTemplate>
-                    <DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize">
-                        <StackPanel Orientation="Horizontal" Spacing="4" >
-                            <TextBox Text="{x:Bind Name}" 
+                    <DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize" >
+                        <StackPanel Orientation="Horizontal" Padding="0" Spacing="4">
+                            <TextBox Text="{x:Bind Path=Name, Mode=TwoWay}" 
                                      Width="90" 
-                                     Height="35" />
+                                     Height="35" 
+                                     Margin="{StaticResource SmallTopMargin}"/>
 
-                            <ComboBox 
-                                      SelectedIndex="{x:Bind Fit}"
+                            <ComboBox SelectedIndex="{x:Bind Path=Fit, Mode=TwoWay}"
                                       Width="90" 
-                                      Height="35">
+                                      Height="35"
+                                      Margin="{StaticResource SmallTopMargin}">
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fill" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Fit" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Fit_Stretch" />
                             </ComboBox>
 
-                            <muxc:NumberBox Value="{x:Bind Width}" 
-                                            Width="68" 
-                                            Height="35"/>
+                            <muxc:NumberBox Value="{x:Bind Path=Width, Mode=TwoWay}" 
+                                            Width="68"
+                                            Height="34"
+                                            Margin="{StaticResource SmallTopMargin}"/>
 
                             <TextBlock Text="x" 
                                        FontWeight="SemiBold" 
                                        TextAlignment="Center" 
-                                       Margin="0,4,0,0" 
+                                       Margin="{StaticResource SmallTopMargin}" 
                                        Width="25" 
                                        Height="35"/>
 
-                            <muxc:NumberBox Value="{x:Bind Height}" 
+                            <muxc:NumberBox Value="{x:Bind Path=Height, Mode=TwoWay}" 
                                             Width="68" 
-                                            Height="35"/>
+                                            Height="34"
+                                            Margin="{StaticResource SmallTopMargin}"/>
 
-                            <ComboBox SelectedIndex="{Binding Unit}"
+                            <ComboBox SelectedIndex="{Binding Path=Unit, Mode=TwoWay}"
                                       Width="90" 
-                                      Height="35">
+                                      Height="35"
+                                      Margin="{StaticResource SmallTopMargin}">
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_CM" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Inches" />
                                 <ComboBoxItem x:Uid="ImageResizer_Sizes_Units_Percent" />
@@ -108,13 +146,15 @@
                                           Command = "{Binding DeleteImageSizeEventHandler, Source={StaticResource ViewModel}}"
                                           CommandParameter="{Binding Id}"                                          
                                           Icon="Delete" 
-                                          Width="68" 
-                                          Height="35"/>
+                                          Width="52" 
+                                          Height="32"
+                                          Margin="{StaticResource SmallTopMargin}" Padding="0,0,50,100" UseLayoutRounding="False"/>
                         </StackPanel>
                     </DataTemplate>
                 </ListView.ItemTemplate>
             </ListView>
 
+
             <StackPanel Orientation="Horizontal">
                 <AppBarButton Icon="Add"
                               x:Name="AddSizeButton"
@@ -123,30 +163,22 @@
                               Margin="{StaticResource SmallTopMargin}"
                               Command = "{Binding AddImageSizeEventHandler, Source={StaticResource ViewModel}}"
                           />
-
-                <AppBarButton Icon="Save"
-                              x:Name="SaveSizeButton"
-                              IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}"
-                              Label="Save Sizes"
-                              Margin="{StaticResource SmallTopMargin}"
-                              Command = "{Binding Remove, Source={StaticResource ViewModel}}"
-                          />
             </StackPanel>
 
             <TextBlock Text="Encoding" 
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
             <ComboBox Header="Fallback encoder"
-                          SelectedIndex="{ Binding Mode=TwoWay, Path=Encoder}"
+                          SelectedIndex="{Binding Mode=TwoWay, Path=Encoder}"
                           MinWidth="240"
                           Margin="{StaticResource SmallTopMargin}"
                           IsEnabled="{ Binding Mode=TwoWay, Path=IsEnabled}">
-                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_PNG">PNG Encoder</ComboBoxItem>
-                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_BMP">BMP Encoder</ComboBoxItem>
-                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_JPEG">JPEG Encoder</ComboBoxItem>
-                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_TIFF">TIFF Encoder</ComboBoxItem>
-                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_WMPhoto">WMPhoto Encoder</ComboBoxItem>
-                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF">GIF Encoder</ComboBoxItem>                
+                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_PNG" />
+                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_BMP" />
+                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_JPEG" />
+                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_TIFF" />
+                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_WMPhoto" />
+                <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" />
             </ComboBox>
 
 
diff --git a/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/ImageResizer.cs b/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/ImageResizer.cs
index f69843790cc3..aca4e550f79d 100644
--- a/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/ImageResizer.cs
+++ b/src/core/Microsoft.PowerToys.Settings.UnitTest/ViewModelTests/ImageResizer.cs
@@ -72,8 +72,8 @@ public void JPEGQualityLevel_ShouldSetValueToTen_WhenSuccefull()
             viewModel.JPEGQualityLevel = 10;
 
             // Assert
-            ImageResizerSettings settings = SettingsUtils.GetSettings<ImageResizerSettings>(Module);
-            Assert.AreEqual(10, settings.Properties.ImageresizerJpegQualityLevel.Value);
+            viewModel = new ImageResizerViewModel();
+            Assert.AreEqual(10, viewModel.JPEGQualityLevel);
         }
 
         [TestMethod]
@@ -86,8 +86,8 @@ public void PngInterlaceOption_ShouldSetValueToTen_WhenSuccefull()
             viewModel.PngInterlaceOption = 10;
 
             // Assert
-            ImageResizerSettings settings = SettingsUtils.GetSettings<ImageResizerSettings>(Module);
-            Assert.AreEqual(10, settings.Properties.ImageresizerPngInterlaceOption.Value);
+            viewModel = new ImageResizerViewModel();
+            Assert.AreEqual(10, viewModel.PngInterlaceOption);
         }
 
         [TestMethod]
@@ -100,8 +100,8 @@ public void TiffCompressOption_ShouldSetValueToTen_WhenSuccefull()
             viewModel.TiffCompressOption = 10;
 
             // Assert
-            ImageResizerSettings settings = SettingsUtils.GetSettings<ImageResizerSettings>(Module);
-            Assert.AreEqual(10, settings.Properties.ImageresizerTiffCompressOption.Value);
+            viewModel = new ImageResizerViewModel();
+            Assert.AreEqual(10, viewModel.TiffCompressOption);
         }
 
         [TestMethod]
@@ -115,8 +115,8 @@ public void FileName_ShouldUpdateValue_WhenSuccefull()
             viewModel.FileName = exptectedValue;
 
             // Assert
-            ImageResizerSettings settings = SettingsUtils.GetSettings<ImageResizerSettings>(Module);
-            Assert.AreEqual(exptectedValue, settings.Properties.ImageresizerFileName.Value);
+            viewModel = new ImageResizerViewModel();
+            Assert.AreEqual(exptectedValue, viewModel.FileName);
         }
 
         [TestMethod]
@@ -142,6 +142,7 @@ public void FileName_ShouldNOTUpdateValue_WhenNameIsInValid ()
             // act and Assert
             foreach (string invalidName in invalidNames)
             {
+                viewModel = new ImageResizerViewModel();
                 viewModel.FileName = invalidName;
                 Assert.AreNotEqual(invalidName, viewModel.FileName);
                 
@@ -175,8 +176,8 @@ public void Encoder_ShouldUpdateValue_WhenSuccefull()
             viewModel.Encoder = 3;
 
             // Assert
-            ImageResizerSettings settings = SettingsUtils.GetSettings<ImageResizerSettings>(Module);
-            Assert.AreEqual("163bcc30-e2e9-4f0b-961d-a3e9fdb788a3", settings.Properties.ImageresizerFallbackEncoder.Value);
+            viewModel = new ImageResizerViewModel();
+            Assert.AreEqual("163bcc30-e2e9-4f0b-961d-a3e9fdb788a3", viewModel.GetEncoderGuid(viewModel.Encoder));
             Assert.AreEqual(3, viewModel.Encoder);
         }