diff --git a/src/Views/ImageContainer.cs b/src/Views/ImageContainer.cs
index b62746ed..2c37d12a 100644
--- a/src/Views/ImageContainer.cs
+++ b/src/Views/ImageContainer.cs
@@ -86,26 +86,12 @@ namespace SourceGit.Views
                 var imageSize = image.Size;
                 var scaleW = availableSize.Width / imageSize.Width;
                 var scaleH = availableSize.Height / imageSize.Height;
-                var scale = Math.Min(scaleW, scaleH);
+                var scale = Math.Min(1, Math.Min(scaleW, scaleH));
                 return new Size(scale * imageSize.Width, scale * imageSize.Height);
             }
 
             return availableSize;
         }
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            if (Image is { } image)
-            {
-                var imageSize = image.Size;
-                var scaleW = finalSize.Width / imageSize.Width;
-                var scaleH = finalSize.Height / imageSize.Height;
-                var scale = Math.Min(scaleW, scaleH);
-                return new Size(scale * imageSize.Width, scale * imageSize.Height);
-            }
-
-            return base.ArrangeOverride(finalSize);
-        }
     }
 
     public class ImageSwipeControl : ImageContainer
@@ -243,7 +229,7 @@ namespace SourceGit.Views
         {
             var sw = available.Width / img.Width;
             var sh = available.Height / img.Height;
-            var scale = Math.Min(sw, sh);
+            var scale = Math.Min(1, Math.Min(sw, sh));
             return new Size(scale * img.Width, scale * img.Height);
         }
 
@@ -348,7 +334,7 @@ namespace SourceGit.Views
         {
             var sw = available.Width / img.Width;
             var sh = available.Height / img.Height;
-            var scale = Math.Min(sw, sh);
+            var scale = Math.Min(1, Math.Min(sw, sh));
             return new Size(scale * img.Width, scale * img.Height);
         }
 
diff --git a/src/Views/ImageDiffView.axaml b/src/Views/ImageDiffView.axaml
index d0b79f57..54a20628 100644
--- a/src/Views/ImageDiffView.axaml
+++ b/src/Views/ImageDiffView.axaml
@@ -32,8 +32,8 @@
             <TextBlock Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>
           </StackPanel>
 
-          <Border Grid.Row="1" Margin="0,12,0,0" Effect="drop-shadow(0 0 8 #A0000000)">
-            <Border Background="{DynamicResource Brush.Popup}" HorizontalAlignment="Center" Padding="8">
+          <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
+            <Border Background="{DynamicResource Brush.Popup}" Padding="8">
               <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}">
                 <v:ImageView Image="{Binding Old}"/>
               </Border>
@@ -52,8 +52,8 @@
             <TextBlock Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>
           </StackPanel>
 
-          <Border Grid.Row="1" Margin="0,12,0,0" Effect="drop-shadow(0 0 8 #A0000000)">
-            <Border Background="{DynamicResource Brush.Popup}" HorizontalAlignment="Center" Padding="8">
+          <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
+            <Border Background="{DynamicResource Brush.Popup}" Padding="8">
               <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}">
                 <v:ImageView Image="{Binding New}"/>
               </Border>
@@ -87,8 +87,8 @@
           <TextBlock Grid.Column="7" Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>
         </Grid>
 
-        <Border Grid.Row="1" Margin="0,12,0,0" Effect="drop-shadow(0 0 8 #A0000000)">
-          <Border HorizontalAlignment="Center" Background="{DynamicResource Brush.Window}">
+        <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
+          <Border Background="{DynamicResource Brush.Window}">
             <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Margin="8">
               <v:ImageSwipeControl OldImage="{Binding Old}"
                                    NewImage="{Binding New}"
@@ -123,8 +123,8 @@
           <TextBlock Grid.Column="7" Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>
         </Grid>
 
-        <Border Grid.Row="1" Margin="0,12,0,0" Effect="drop-shadow(0 0 8 #A0000000)">
-          <Border HorizontalAlignment="Center" Background="{DynamicResource Brush.Window}">
+        <Border Grid.Row="1" Margin="0,12,0,0" HorizontalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
+          <Border Background="{DynamicResource Brush.Window}">
             <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Margin="8">
               <v:ImageBlendControl Alpha="{Binding #ImageBlendSlider.Value}"
                                    OldImage="{Binding Old}"
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index 7dc6d384..d595ee1b 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -29,7 +29,7 @@
 
     <DataTemplate DataType="m:RevisionImageFile">
       <Grid RowDefinitions="*,Auto" Margin="0,8" VerticalAlignment="Center" HorizontalAlignment="Center">
-        <Border Grid.Row="0" Effect="drop-shadow(0 0 8 #A0000000)">
+        <Border Grid.Row="0" HorizontalAlignment="Center" Effect="drop-shadow(0 0 8 #A0000000)">
           <Border Background="{DynamicResource Brush.Window}">
             <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Margin="8">
               <v:ImageView Image="{Binding Image}"/>