diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index c4e7e8e4..5efd2c26 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -384,6 +384,7 @@ namespace SourceGit.ViewModels
         {
             _changes = null;
             FullMessage = string.Empty;
+            Changes = [];
             VisibleChanges = null;
             SelectedChanges = null;
             ViewRevisionFileContent = null;
diff --git a/src/Views/CommitDetail.axaml b/src/Views/CommitDetail.axaml
index d2f467d7..76e33582 100644
--- a/src/Views/CommitDetail.axaml
+++ b/src/Views/CommitDetail.axaml
@@ -8,8 +8,7 @@
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.CommitDetail"
-             x:DataType="vm:CommitDetail"
-             Background="{DynamicResource Brush.Window}">
+             x:DataType="vm:CommitDetail">
   <TabControl SelectedIndex="{Binding ActivePageIndex, Mode=TwoWay}" Padding="4">
     <!-- Information Page -->
     <TabItem>
diff --git a/src/Views/FileHistories.axaml b/src/Views/FileHistories.axaml
index c97582bc..5ae1d15e 100644
--- a/src/Views/FileHistories.axaml
+++ b/src/Views/FileHistories.axaml
@@ -120,22 +120,26 @@
                       HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
                       Background="Transparent"/>
 
-        <Grid Grid.Row="2" Margin="0,0,4,4">
-          <Border Background="{DynamicResource Brush.Window}">
-            <Path Width="128" Height="128"
-                  Data="{StaticResource Icons.Detail}"
-                  HorizontalAlignment="Center"
-                  Fill="{DynamicResource Brush.FG2}"/>
-          </Border>
-
-          <ContentControl Content="{Binding DetailContext}">
+        <Border Grid.Row="2" Margin="0,0,4,4">
+          <ContentControl>
+            <ContentControl.Content>
+              <Binding Path="DetailContext">
+                <Binding.TargetNullValue>
+                  <Path Width="128" Height="128"
+                        Data="{StaticResource Icons.Detail}"
+                        HorizontalAlignment="Center"
+                        Fill="{DynamicResource Brush.FG2}"/>
+                </Binding.TargetNullValue>
+              </Binding>
+            </ContentControl.Content>
+            
             <ContentControl.DataTemplates>
               <DataTemplate DataType="vm:CommitDetail">
                 <v:CommitDetail/>
               </DataTemplate>
             </ContentControl.DataTemplates>
           </ContentControl>
-        </Grid>
+        </Border>
       </Grid>
     </Grid>
   </Grid>
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index a2fe5383..cec18992 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -174,15 +174,19 @@
                   Background="{DynamicResource Brush.Window}"
                   BorderBrush="{DynamicResource Brush.Border0}"/>
 
-    <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
-      <Border Background="{DynamicResource Brush.Window}">
-        <Path Width="128" Height="128"
-              Data="{StaticResource Icons.Detail}"
-              HorizontalAlignment="Center"
-              Fill="{DynamicResource Brush.FG2}"/>
-      </Border>
-
-      <ContentControl Content="{Binding DetailContext}">
+    <Border Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
+      <ContentControl>
+        <ContentControl.Content>
+          <Binding Path="DetailContext">
+            <Binding.TargetNullValue>
+              <Path Width="128" Height="128"
+                    Data="{StaticResource Icons.Detail}"
+                    HorizontalAlignment="Center"
+                    Fill="{DynamicResource Brush.FG2}"/>
+            </Binding.TargetNullValue>
+          </Binding>
+        </ContentControl.Content>
+        
         <ContentControl.DataTemplates>
           <DataTemplate DataType="vm:CommitDetail">
             <v:CommitDetail/>
@@ -193,23 +197,21 @@
           </DataTemplate>
 
           <DataTemplate DataType="x:Int32">
-            <Grid Background="{DynamicResource Brush.Window}">
-              <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-                <Path Width="128" Height="128"
-                      Data="{StaticResource Icons.Detail}"
-                      HorizontalAlignment="Center"
-                      Fill="{DynamicResource Brush.FG2}"/>
+            <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+              <Path Width="128" Height="128"
+                    Data="{StaticResource Icons.Detail}"
+                    HorizontalAlignment="Center"
+                    Fill="{DynamicResource Brush.FG2}"/>
 
-                <TextBlock HorizontalAlignment="Center"
-                           Margin="0,16"
-                           FontSize="24" FontWeight="Bold"
-                           Foreground="{DynamicResource Brush.FG2}"
-                           Text="{Binding Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Histories.Selected'}"/>
-              </StackPanel>
-            </Grid>
+              <TextBlock HorizontalAlignment="Center"
+                         Margin="0,16"
+                         FontSize="24" FontWeight="Bold"
+                         Foreground="{DynamicResource Brush.FG2}"
+                         Text="{Binding Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Histories.Selected'}"/>
+            </StackPanel>
           </DataTemplate>
         </ContentControl.DataTemplates>
       </ContentControl>
-    </Grid>
+    </Border>
   </v:LayoutableGrid>
 </UserControl>
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index d0a4cc33..5f8b4bce 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -260,15 +260,14 @@
                       BorderThickness="0,1,0,0"
                       BorderBrush="{DynamicResource Brush.Border2}"/>
 
-        <Border Grid.Row="2" Background="{DynamicResource Brush.Window}">
+        <Grid Grid.Row="2">
           <Path Width="128" Height="128"
                 Data="{StaticResource Icons.Detail}"
                 HorizontalAlignment="Center"
-                Fill="{DynamicResource Brush.FG2}"/>
-        </Border>
-
-        <Grid Grid.Row="2" IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
-          <ContentControl Content="{Binding DetailContext}">
+                Fill="{DynamicResource Brush.FG2}"
+                IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNull}}"/>
+          
+          <ContentControl Content="{Binding DetailContext}" IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
             <ContentControl.DataTemplates>
               <DataTemplate DataType="vm:CommitDetail">
                 <v:CommitDetail/>
diff --git a/src/Views/LauncherPage.axaml b/src/Views/LauncherPage.axaml
index dda5b7ef..3d57947b 100644
--- a/src/Views/LauncherPage.axaml
+++ b/src/Views/LauncherPage.axaml
@@ -25,7 +25,7 @@
     </Border>
     
     <!-- Body -->
-    <Border Grid.Row="1" Background="{DynamicResource Brush.Window}">
+    <Border Grid.Row="1">
       <ContentControl Content="{Binding Data}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="vm:Welcome">
diff --git a/src/Views/RevisionCompare.axaml b/src/Views/RevisionCompare.axaml
index 14ac66a7..9ba28b49 100644
--- a/src/Views/RevisionCompare.axaml
+++ b/src/Views/RevisionCompare.axaml
@@ -8,8 +8,7 @@
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.RevisionCompare"
-             x:DataType="vm:RevisionCompare"
-             Background="{DynamicResource Brush.Window}">
+             x:DataType="vm:RevisionCompare">
   <UserControl.DataTemplates>
     <DataTemplate DataType="m:Null">
       <Border HorizontalAlignment="Center" VerticalAlignment="Center" Background="{DynamicResource Brush.Accent}" CornerRadius="4">