diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 6329ead88..b4d7e78a7 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1469,6 +1469,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="ui:ToggleSwitch">
                     <Border
+                        Width="Auto"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
@@ -1498,7 +1499,7 @@
                                 Visibility="Collapsed" />
                             <Grid
                                 Grid.Row="1"
-                                MinWidth="{DynamicResource ToggleSwitchThemeMinWidth}"
+                                MinWidth="10"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Top">
 
@@ -1509,7 +1510,7 @@
                                 </Grid.RowDefinitions>
 
                                 <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="12" MaxWidth="12" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index e45d74321..f7c3dc6a4 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -992,7 +992,7 @@
                                                         <Border>
                                                             <Button
                                                                 x:Name="PriorityButton"
-                                                                Margin="0,0,0,0"
+                                                                Margin="0,0,18,0"
                                                                 VerticalAlignment="Center"
                                                                 Click="OnPluginPriorityClick"
                                                                 Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
@@ -1023,7 +1023,12 @@
                                                         </Border>
                                                     </StackPanel>
                                                     <DockPanel Grid.Column="3">
-                                                        <ui:ToggleSwitch HorizontalAlignment="Right" IsOn="{Binding PluginState}" />
+                                                        <ui:ToggleSwitch
+                                                            Margin="0,0,6,0"
+                                                            HorizontalAlignment="Right"
+                                                            IsOn="{Binding PluginState}"
+                                                            OffContent="{DynamicResource disable}"
+                                                            OnContent="{DynamicResource enable}" />
                                                     </DockPanel>
                                                 </Grid>