diff --git a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
index 2a4b22bf3..b1888e574 100644
--- a/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
+++ b/Flow.Launcher.Core/Plugin/JsonRPCPluginSettings.cs
@@ -30,6 +30,8 @@ namespace Flow.Launcher.Core.Plugin
         private JsonStorage<ConcurrentDictionary<string, object>> _storage;
 
         // maybe move to resource?
+        private static Thickness settingPanelMargin1 = (Thickness)System.Windows.Application.Current.FindResource("SettingPanelMargin");
+        
         private static readonly Thickness settingControlMargin = new(0, 9, 18, 9);
         private static readonly Thickness settingCheckboxMargin = new(0, 9, 9, 9);
         private static readonly Thickness settingPanelMargin = new(0, 0, 0, 0);
diff --git a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
index 3944f6b75..d2d2afa09 100644
--- a/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
+++ b/Flow.Launcher/Resources/Controls/InstalledPluginDisplayKeyword.xaml
@@ -20,7 +20,7 @@
         Visibility="{Binding ActionKeywordsVisibility}">
         <DockPanel Margin="{StaticResource SettingPanelMargin}">
             <TextBlock
-                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                Margin="{StaticResource SettingPanelItemRightMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 DockPanel.Dock="Left"
@@ -28,7 +28,7 @@
                 &#xe819;
             </TextBlock>
             <TextBlock
-                Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+                Margin="{StaticResource SettingPanelItemRightMargin}"
                 HorizontalAlignment="Left"
                 VerticalAlignment="Center"
                 DockPanel.Dock="Left"
@@ -36,7 +36,7 @@
                 Text="{DynamicResource actionKeywords}" />
             <Button
                 Width="100"
-                Margin="{StaticResource SettingPanelItemLeftTopBottomMargin}"
+                Margin="{StaticResource SettingPanelItemLeftMargin}"
                 HorizontalAlignment="Right"
                 Command="{Binding SetActionKeywordsCommand}"
                 Content="{Binding ActionKeywordsText}"
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index 69c535d3c..e2a3bda37 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -5587,8 +5587,13 @@
     </Style>
 
     <!--  Settings Panel  -->
-    <Thickness x:Key="SettingPanelMargin">70,0,18,0</Thickness>
+    <Thickness x:Key="SettingPanelMargin">70,9,18,9</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftMargin">9,0,0,0</Thickness>
+    <Thickness x:Key="SettingPanelItemRightMargin">0,0,9,0</Thickness>
+    <Thickness x:Key="SettingPanelItemTopBottomMargin">0,9,0,9</Thickness>
+
     <Thickness x:Key="SettingPanelItemLeftTopBottomMargin">9,9,0,9</Thickness>
     <Thickness x:Key="SettingPanelItemRightTopBottomMargin">0,9,9,9</Thickness>
-    <Thickness x:Key="SettingPanelItemLeftRightTopBottomMargin">9,9,9,9</Thickness>
+    <Thickness x:Key="SettingPanelItemLeftBottomMargin">9,0,0,9</Thickness>
+    <Thickness x:Key="SettingPanelItemRightBottomMargin">0,0,9,9</Thickness>
 </ResourceDictionary>
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index ceee3897c..d7bd11b83 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -54,7 +54,7 @@
         <TextBlock
             Grid.Row="1"
             Grid.Column="0"
-            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+            Margin="{StaticResource SettingPanelItemRightBottomMargin}"
             VerticalAlignment="Center"
             FontSize="14"
             Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" />
@@ -62,7 +62,7 @@
             x:Name="MaxDecimalPlaces"
             Grid.Row="1"
             Grid.Column="1"
-            Margin="{StaticResource SettingPanelItemRightTopBottomMargin}"
+            Margin="{StaticResource SettingPanelItemRightBottomMargin}"
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
             ItemsSource="{Binding MaxDecimalPlacesRange}"
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
index f806900de..95fdd78d4 100644
--- a/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Sys/SysSettings.xaml
@@ -7,11 +7,11 @@
     d:DesignHeight="300"
     d:DesignWidth="300"
     mc:Ignorable="d">
-    <Grid Margin="70,18,18,18">
+    <Grid Margin="{StaticResource SettingPanelMargin}">
         <ListView
             x:Name="lbxCommands"
             Grid.Row="0"
-            Margin="0"
+            Margin="{StaticResource SettingPanelItemTopBottomMargin}"
             BorderBrush="DarkGray"
             BorderThickness="1"
             SizeChanged="ListView_SizeChanged"