diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 08b239c41..cdaadd45a 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -2407,6 +2407,79 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!-- Explorer Plugin Expander -->
+    <Style x:Key="ExpanderHeaderRightArrowStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="RootBorder" Background="Transparent" Padding="16,15,16,15">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <ContentPresenter
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            HorizontalAlignment="Left"
+                            RecognizesAccessKey="True"
+                            SnapsToDevicePixels="True"
+                            Content="{TemplateBinding Content}"
+                            Margin="8 0 0 0"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+
+                            <Grid Grid.Column="1"
+                              Width="20" Height="20"
+                              Margin="8 0 4 0"
+                              VerticalAlignment="Center"
+                              HorizontalAlignment="Right"
+                              Background="Transparent"
+                              RenderTransformOrigin="0.5,0.5"
+                              x:Name="ChevronGrid">
+                                <Grid.RenderTransform>
+                                    <RotateTransform Angle="0"/>
+                                </Grid.RenderTransform>
+                                <Ellipse
+                                x:Name="circle"
+                                Width="19"
+                                Height="19"
+                                Stroke="Transparent"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"/>
+                                <Path
+                                x:Name="arrow"
+                                Data="M 1,1.5 L 4.5,5 L 8,1.5"
+                                Stroke="#666"
+                                StrokeThickness="1"
+                                SnapsToDevicePixels="False"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center" />
+                            </Grid>
+                        </Grid>
+                    </Border>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="arrow" Property="Data" Value="M 1,4.5  L 4.5,1  L 8,4.5" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="RootBorder" Property="Background" Value="{DynamicResource CustomExpanderHover}" />
+                            <Setter TargetName="circle" Property="Stroke" Value="Transparent" />
+                            <Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color05B}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="circle" Property="Stroke" Value="Transparent" />
+                            <Setter TargetName="circle" Property="StrokeThickness" Value="1.5" />
+                            <Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color17B}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <Style x:Key="ExpanderStyle1" TargetType="{x:Type Expander}">
         <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
         <Setter Property="Background" Value="Transparent" />
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index b81c3cac3..0d4710e24 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -80,23 +80,96 @@
         <converters:EnumNameConverter x:Key="EnumNameConverter" />
 
         <Style x:Key="CustomExpanderStyle" TargetType="Expander">
-            <Setter Property="Margin" Value="0 0 0 5" />
-            <Setter Property="HeaderTemplate">
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+            <Setter Property="Background" Value="Transparent" />
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="Stretch" />
+            <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
+            <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Padding" Value="-8 18 24 14" />
+            <Setter Property="Template">
                 <Setter.Value>
-                    <DataTemplate>
-                        <TextBlock
-                            Margin="8 5 0 5"
-                            FontSize="14"
-                            Foreground="{DynamicResource Color05B}"
-                            Text="{Binding}" />
-                    </DataTemplate>
+                    <ControlTemplate TargetType="Expander">
+                        <Border
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    SnapsToDevicePixels="true">
+                            <DockPanel>
+                                <ToggleButton
+                            x:Name="HeaderSite"
+                            MinWidth="0"
+                            MinHeight="0"
+                            Margin="0"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            ContentTemplateSelector="{TemplateBinding HeaderTemplateSelector}"
+                            DockPanel.Dock="Top"
+                            FocusVisualStyle="{StaticResource ExpanderHeaderFocusVisual}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontSize="{TemplateBinding FontSize}"
+                            FontStretch="{TemplateBinding FontStretch}"
+                            FontStyle="{TemplateBinding FontStyle}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}"
+                            IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
+                            Style="{StaticResource ExpanderHeaderRightArrowStyle}" />
+                                <Border x:Name="ContentPresenterBorder"   BorderThickness="0,1,0,0"
+        BorderBrush="{DynamicResource Color03B}">
+                                    <ContentPresenter
+                                x:Name="ExpandSite"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                DockPanel.Dock="Bottom"
+                                Focusable="false" />
+                                    <Border.LayoutTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </Border.LayoutTransform>
+                                </Border>
+                            </DockPanel>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsExpanded" Value="true">
+                                <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
+                                <Setter TargetName="ContentPresenterBorder" Property="BorderThickness" Value="0 1 0 0" />
+                                <Trigger.EnterActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.LayoutTransform).(ScaleTransform.ScaleY)"
+                                        From="0.0" To="1.0" Duration="0:0:0" />
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.Opacity)"
+                                        From="0.0" To="1.0" Duration="0:0:0" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.EnterActions>
+                                <Trigger.ExitActions>
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.LayoutTransform).(ScaleTransform.ScaleY)"
+                                        From="1.0" To="0.0" Duration="0:0:0" />
+                                            <DoubleAnimation
+                                        Storyboard.TargetName="ContentPresenterBorder"
+                                        Storyboard.TargetProperty="(Border.Opacity)"
+                                        From="1.0" To="0.0" Duration="0:0:0" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </Trigger.ExitActions>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
                 </Setter.Value>
             </Setter>
-            <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
-            <Setter Property="BorderThickness" Value="0 0 0 1" />
-            <Setter Property="Background" Value="{DynamicResource Color00B}" />
-            <Setter Property="Padding" Value="20 5 20 10" />
-            <!--  Adjusted padding for content  -->
         </Style>
     </UserControl.Resources>