diff --git a/src/PicView.Avalonia/UI/ThemeHelper.cs b/src/PicView.Avalonia/UI/ThemeHelper.cs
index 7fc98cdae..d559faed7 100644
--- a/src/PicView.Avalonia/UI/ThemeHelper.cs
+++ b/src/PicView.Avalonia/UI/ThemeHelper.cs
@@ -18,7 +18,7 @@ public static void ChangeBackground(MainViewModel vm)
         {
             return;
         }
-        SettingsHelper.Settings.UIProperties.BgColorChoice = (SettingsHelper.Settings.UIProperties.BgColorChoice + 1) % 6;
+        SettingsHelper.Settings.UIProperties.BgColorChoice = (SettingsHelper.Settings.UIProperties.BgColorChoice + 1) % 8;
         vm.ImageBackground = BackgroundColorBrush;
     }
     
@@ -31,10 +31,11 @@ public static void SetBackground(MainViewModel vm)
     {
         0 => new SolidColorBrush(Colors.Transparent),
         1 => new SolidColorBrush(Colors.White),
-        2 => new SolidColorBrush(Color.FromRgb(15, 15, 15)),
-        3 => new SolidColorBrush(Color.FromRgb(5, 5, 5)),
-        4 => CreateCheckerboardBrush(),
-        5 => CreateCheckerboardBrush(Color.FromRgb(235, 235, 235), Color.FromRgb(40, 40, 40), 60),
+        3 => new SolidColorBrush(Color.FromRgb(35, 35, 35)),
+        4 => new SolidColorBrush(Color.FromRgb(15, 15, 15)),
+        5 => new SolidColorBrush(Color.FromRgb(5, 5, 5)),
+        6 => CreateCheckerboardBrush(),
+        7 => CreateCheckerboardBrush(Color.FromRgb(235, 235, 235), Color.FromRgb(40, 40, 40), 60),
         _ => new SolidColorBrush(Colors.Transparent),
     };
     
diff --git a/src/PicView.Avalonia/Views/ImageViewer.axaml b/src/PicView.Avalonia/Views/ImageViewer.axaml
index 1e6df73f9..71f4d1a1f 100644
--- a/src/PicView.Avalonia/Views/ImageViewer.axaml
+++ b/src/PicView.Avalonia/Views/ImageViewer.axaml
@@ -24,7 +24,12 @@
             Width="{CompiledBinding ScrollViewerWidth,
                                     Mode=OneWay}"
             x:Name="ImageScrollViewer">
-            <Border x:Name="MainBorder">
+            <Border
+                Height="{CompiledBinding ImageHeight,
+                                         Mode=OneWay}"
+                Width="{CompiledBinding ImageWidth,
+                                        Mode=OneWay}"
+                x:Name="MainBorder">
                 <customControls:PicBox
                     ImageType="{CompiledBinding ImageType,
                                                 Mode=OneWay}"