diff --git a/Files/ResourceDictionaries/DefaultGridSplitterStyle.xaml b/Files/ResourceDictionaries/DefaultGridSplitterStyle.xaml
index 411ddd6eb1b7..91905542d1d2 100644
--- a/Files/ResourceDictionaries/DefaultGridSplitterStyle.xaml
+++ b/Files/ResourceDictionaries/DefaultGridSplitterStyle.xaml
@@ -11,6 +11,7 @@
         <Setter Property="IsFocusEngagementEnabled" Value="True" />
         <Setter Property="MinWidth" Value="2" />
         <Setter Property="MinHeight" Value="2" />
+        <Setter Property="BorderBrush" Value="{ThemeResource SplitterBorderBrush}" />
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="GripperForeground" Value="Transparent" />
         <Setter Property="Template">
@@ -19,7 +20,7 @@
                     <Grid
                         x:Name="RootGrid"
                         Background="Transparent"
-                        BorderBrush="{ThemeResource SystemBaseLowColor}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="1,0,0,0">
                         <ContentPresenter
                             HorizontalContentAlignment="Stretch"
@@ -28,7 +29,11 @@
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="GridSplitterStates">
                                 <VisualState x:Name="Normal" />
-
+                                <VisualState x:Name="PointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootGrid.Background" Value="Transparent" />
+                                    </VisualState.Setters>
+                                </VisualState>
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
                                         <Setter Target="RootGrid.Background" Value="Transparent" />
@@ -42,26 +47,25 @@
         </Setter>
     </Style>
 
-    <Style x:Key="PaneGridSplitter" TargetType="controls:GridSplitter">
-        <Setter Property="IsTabStop" Value="True" />
-        <Setter Property="UseSystemFocusVisuals" Value="True" />
-        <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="VerticalAlignment" Value="Stretch" />
-        <Setter Property="IsFocusEngagementEnabled" Value="True" />
-        <Setter Property="MinWidth" Value="2" />
-        <Setter Property="MinHeight" Value="2" />
-        <Setter Property="Background" Value="{ThemeResource SystemBaseLowColor}" />
-        <Setter Property="GripperForeground" Value="{ThemeResource SystemBaseLowColor}" />
+    <Style
+        x:Key="InvisibleGridSplitterStyle"
+        BasedOn="{StaticResource DefaultGridSplitterStyle}"
+        TargetType="controls:GridSplitter">
+        <Setter Property="BorderBrush" Value="{ThemeResource TransparentSplitterBorderBrush}" />
     </Style>
+
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
-            <SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="TransparentSplitterBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="SplitterBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
-            <SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="TransparentSplitterBorderBrush" Color="Transparent" />
+            <SolidColorBrush x:Key="SplitterBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
-            <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
+            <SolidColorBrush x:Key="TransparentSplitterBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
+            <SolidColorBrush x:Key="SplitterBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Files/UserControls/PreviewPane.xaml b/Files/UserControls/PreviewPane.xaml
index 5757ac928696..b8abceac5a0a 100644
--- a/Files/UserControls/PreviewPane.xaml
+++ b/Files/UserControls/PreviewPane.xaml
@@ -20,7 +20,6 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
                 <ResourceDictionary Source="ms-appx:///ResourceDictionaries/PropertiesStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
diff --git a/Files/Views/ColumnShellPage.xaml b/Files/Views/ColumnShellPage.xaml
index 05c1a0fc9369..1d55d2fda6bc 100644
--- a/Files/Views/ColumnShellPage.xaml
+++ b/Files/Views/ColumnShellPage.xaml
@@ -13,65 +13,6 @@
     mc:Ignorable="d">
     <Page.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
-                <Setter Property="IsTabStop" Value="True" />
-                <Setter Property="UseSystemFocusVisuals" Value="True" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
-                <Setter Property="IsFocusEngagementEnabled" Value="True" />
-                <Setter Property="MinWidth" Value="2" />
-                <Setter Property="MinHeight" Value="2" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="GripperForeground" Value="Transparent" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Custom:GridSplitter">
-                            <Grid
-                                x:Name="RootGrid"
-                                Background="Transparent"
-                                BorderBrush="{ThemeResource SidebarBorderBrush}"
-                                BorderThickness="1,0,0,0">
-                                <ContentPresenter
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    Content="{TemplateBinding Element}" />
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="GridSplitterStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
             <converters:BoolToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
diff --git a/Files/Views/MainPage.xaml b/Files/Views/MainPage.xaml
index 210ae53e0ba8..f4b83d78fdfc 100644
--- a/Files/Views/MainPage.xaml
+++ b/Files/Views/MainPage.xaml
@@ -25,19 +25,20 @@
     </Page.DataContext>
     <Page.Resources>
         <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
                     <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
                     <Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
                     <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
                     <Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
                     <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
                     <Thickness x:Key="NavigationViewContentGridBorderThickness">1,0,0,0</Thickness>
                 </ResourceDictionary>
@@ -46,48 +47,6 @@
             <x:Boolean x:Key="True">True</x:Boolean>
             <x:Boolean x:Key="False">False</x:Boolean>
 
-            <Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
-                <Setter Property="IsTabStop" Value="True" />
-                <Setter Property="UseSystemFocusVisuals" Value="True" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
-                <Setter Property="IsFocusEngagementEnabled" Value="True" />
-                <Setter Property="MinWidth" Value="2" />
-                <Setter Property="MinHeight" Value="2" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="GripperForeground" Value="Transparent" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Custom:GridSplitter">
-                            <Grid
-                                x:Name="RootGrid"
-                                Background="Transparent"
-                                BorderBrush="Transparent"
-                                BorderThickness="1,0,0,0">
-                                <ContentPresenter
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    Content="{TemplateBinding Element}" />
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="GridSplitterStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
             <converters:WidthToRightMargin x:Key="WidthToRightMarginConverter" />
             <converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
         </ResourceDictionary>
@@ -446,7 +405,7 @@
                     x:Load="{x:Bind LoadPreviewPane, Mode=OneWay}"
                     ManipulationCompleted="PreviewPaneGridSplitter_ManipulationCompleted"
                     ResizeBehavior="BasedOnAlignment"
-                    Style="{StaticResource DefaultGridSplitterStyle}" />
+                    Style="{StaticResource InvisibleGridSplitterStyle}" />
 
                 <controls:StatusBarControl
                     x:Name="StatusBarControl"
diff --git a/Files/Views/ModernShellPage.xaml b/Files/Views/ModernShellPage.xaml
index 39617aeb1e8d..25b9641633c2 100644
--- a/Files/Views/ModernShellPage.xaml
+++ b/Files/Views/ModernShellPage.xaml
@@ -2,7 +2,6 @@
     x:Class="Files.Views.ModernShellPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:Custom="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,65 +12,6 @@
     mc:Ignorable="d">
     <Page.Resources>
         <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-
-            <ResourceDictionary.ThemeDictionaries>
-                <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="Transparent" />
-                </ResourceDictionary>
-                <ResourceDictionary x:Key="HighContrast">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-                </ResourceDictionary>
-            </ResourceDictionary.ThemeDictionaries>
-
-            <Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
-                <Setter Property="IsTabStop" Value="True" />
-                <Setter Property="UseSystemFocusVisuals" Value="True" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
-                <Setter Property="IsFocusEngagementEnabled" Value="True" />
-                <Setter Property="MinWidth" Value="2" />
-                <Setter Property="MinHeight" Value="2" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="GripperForeground" Value="Transparent" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Custom:GridSplitter">
-                            <Grid
-                                x:Name="RootGrid"
-                                Background="Transparent"
-                                BorderBrush="{ThemeResource SidebarBorderBrush}"
-                                BorderThickness="1,0,0,0">
-                                <ContentPresenter
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    Content="{TemplateBinding Element}" />
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="GridSplitterStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
             <converters:BoolToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
             <converters:BoolNegationConverter x:Key="BoolNegationConverter" />
diff --git a/Files/Views/PaneHolderPage.xaml b/Files/Views/PaneHolderPage.xaml
index 93c5ba3d5be8..879943cde408 100644
--- a/Files/Views/PaneHolderPage.xaml
+++ b/Files/Views/PaneHolderPage.xaml
@@ -6,77 +6,32 @@
     xmlns:Custom="using:Microsoft.Toolkit.Uwp.UI.Controls"
     xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
-    xmlns:controls="using:Files.UserControls"
     xmlns:converters="using:Files.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:Files.Views"
-    xmlns:local1="using:Files"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:mconv="using:Microsoft.Toolkit.Uwp.UI.Converters"
-    xmlns:multitaskingcontrol="using:Files.UserControls.MultitaskingControl"
     Background="{ThemeResource PaneHolderPageBackgroundBrush}"
     mc:Ignorable="d">
 
     <Page.Resources>
         <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="ms-appx:///ResourceDictionaries/DefaultGridSplitterStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+
             <ResourceDictionary.ThemeDictionaries>
                 <ResourceDictionary x:Key="Light">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
                     <SolidColorBrush x:Key="PaneBorderBrush" Color="#FAF9F8" />
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="Dark">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource ControlStrokeColorDefault}" />
                     <SolidColorBrush x:Key="PaneBorderBrush" Color="#323130" />
                 </ResourceDictionary>
                 <ResourceDictionary x:Key="HighContrast">
-                    <SolidColorBrush x:Key="SidebarBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
                     <SolidColorBrush x:Key="PaneBorderBrush" Color="{ThemeResource SystemColorWindowColor}" />
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
 
-            <Style x:Key="DefaultGridSplitterStyle" TargetType="Custom:GridSplitter">
-                <Setter Property="IsTabStop" Value="True" />
-                <Setter Property="UseSystemFocusVisuals" Value="True" />
-                <Setter Property="HorizontalAlignment" Value="Stretch" />
-                <Setter Property="VerticalAlignment" Value="Stretch" />
-                <Setter Property="IsFocusEngagementEnabled" Value="True" />
-                <Setter Property="MinWidth" Value="2" />
-                <Setter Property="MinHeight" Value="2" />
-                <Setter Property="Background" Value="Transparent" />
-                <Setter Property="GripperForeground" Value="Transparent" />
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate TargetType="Custom:GridSplitter">
-                            <Grid
-                                x:Name="RootGrid"
-                                Background="Transparent"
-                                BorderBrush="{ThemeResource SidebarBorderBrush}"
-                                BorderThickness="1,0,0,0">
-                                <ContentPresenter
-                                    HorizontalContentAlignment="Stretch"
-                                    VerticalContentAlignment="Stretch"
-                                    Content="{TemplateBinding Element}" />
-                                <VisualStateManager.VisualStateGroups>
-                                    <VisualStateGroup x:Name="GridSplitterStates">
-                                        <VisualState x:Name="Normal" />
-                                        <VisualState x:Name="PointerOver">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                        <VisualState x:Name="Pressed">
-                                            <VisualState.Setters>
-                                                <Setter Target="RootGrid.Background" Value="Transparent" />
-                                            </VisualState.Setters>
-                                        </VisualState>
-                                    </VisualStateGroup>
-                                </VisualStateManager.VisualStateGroups>
-                            </Grid>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-
             <SolidColorBrush x:Key="PaneSelectedBorderBrush" Color="{ThemeResource SystemAccentColorLight1}" />
 
             <mconv:BoolNegationConverter x:Key="BoolNegationConverter" />