diff --git a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
index 80f8c7ccb..7908bd1e3 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
@@ -9,13 +9,13 @@
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    
+
     <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
             <RowDefinition />
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        
+
         <ListView
             x:Name="lbxCommands"
             Grid.Row="0"
@@ -58,11 +58,12 @@
 
         <StackPanel
             Grid.Row="1"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             HorizontalAlignment="Right"
             Orientation="Horizontal">
             <Button
                 Width="100"
-                Margin="10"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
                 Click="OnEditCommandKeywordClick"
                 Content="{DynamicResource flowlauncher_plugin_sys_edit}" />
         </StackPanel>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
index 5c782d044..1b73aa966 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -9,6 +9,7 @@
     d:DesignHeight="300"
     d:DesignWidth="500"
     mc:Ignorable="d">
+
     <UserControl.Resources>
         <Style x:Key="BrowserPathBoxStyle" TargetType="TextBox">
             <Setter Property="Height" Value="28" />
@@ -35,13 +36,15 @@
             </DockPanel>
         </DataTemplate>
     </UserControl.Resources>
+
     <Grid Margin="{StaticResource SettingPanelMargin}">
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition Height="56" />
+            <RowDefinition Height="Auto" />
             <RowDefinition />
-            <RowDefinition Height="50" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
+
         <ListView
             x:Name="SearchSourcesListView"
             Grid.Row="0"
@@ -96,6 +99,7 @@
                 </GridView>
             </ListView.View>
         </ListView>
+
         <StackPanel
             Grid.Row="1"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"
@@ -117,7 +121,9 @@
                 Click="OnAddSearchSearchClick"
                 Content="{DynamicResource flowlauncher_plugin_websearch_add}" />
         </StackPanel>
+
         <Separator Grid.Row="2" Style="{StaticResource SettingPanelSeperatorStyle}" />
+
         <DockPanel
             Grid.Row="3"
             Margin="{StaticResource SettingPanelItemTopBottomMargin}"