diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
index 90e613280..9e093b7a5 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
@@ -87,46 +87,20 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
-                    Width="100"
+                    MinWidth="140"
                     Margin="0,0,5,0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
 
                 <Button
-                    Width="100"
+                    MinWidth="140"
                     Margin="5,0,0,0"
                     HorizontalAlignment="Right"
                     Click="ButtonAdd_OnClick"
-                    Content="{DynamicResource flowlauncher_plugin_program_update}" />
+                    Content="{DynamicResource flowlauncher_plugin_program_update}"
+                    Style="{DynamicResource AccentButtonStyle}" />
             </StackPanel>
         </Border>
     </Grid>
-    <!--
-    <StackPanel Orientation="Vertical">
-        <StackPanel Orientation="Horizontal">
-            <Label Margin="15,10" Content="{DynamicResource flowlauncher_plugin_program_directory}" />
-            <TextBox
-                Name="Directory"
-                Width="278"
-                Margin="10,7"
-                VerticalAlignment="Center" />
-        </StackPanel>
-        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
-            <Button
-                Width="70"
-                Height="31"
-                Margin="10"
-                HorizontalAlignment="Right"
-                Click="BrowseButton_Click"
-                Content="{DynamicResource flowlauncher_plugin_program_browse}" />
-            <Button
-                Width="70"
-                Height="31"
-                Margin="10"
-                HorizontalAlignment="Right"
-                Click="ButtonAdd_OnClick"
-                Content="{DynamicResource flowlauncher_plugin_program_update}" />
-        </StackPanel>
-    </StackPanel>
-    -->
+
 </Window>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
index b8ad553ed..8d8cae02c 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml
@@ -7,6 +7,8 @@
     <system:String x:Key="flowlauncher_plugin_program_delete">Delete</system:String>
     <system:String x:Key="flowlauncher_plugin_program_edit">Edit</system:String>
     <system:String x:Key="flowlauncher_plugin_program_add">Add</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_name">Name</system:String>
+    <system:String x:Key="flowlauncher_plugin_program_enable">Enable</system:String>
     <system:String x:Key="flowlauncher_plugin_program_disable">Disable</system:String>
     <system:String x:Key="flowlauncher_plugin_program_location">Location</system:String>
     <system:String x:Key="flowlauncher_plugin_program_all_programs">All Programs</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
index 5af43867b..470e9e2e7 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml
@@ -80,19 +80,20 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
-                    Width="100"
                     Height="30"
+                    MinWidth="140"
                     Margin="0,0,5,0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
 
                 <Button
-                    Width="100"
                     Height="30"
+                    MinWidth="140"
                     Margin="5,0,0,0"
                     HorizontalAlignment="Right"
                     Click="ButtonBase_OnClick"
-                    Content="{DynamicResource flowlauncher_plugin_program_update}" />
+                    Content="{DynamicResource flowlauncher_plugin_program_update}"
+                    Style="{DynamicResource AccentButtonStyle}" />
             </StackPanel>
         </Border>
     </Grid>
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
index 87fd89ca9..f07879465 100644
--- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml
@@ -22,7 +22,7 @@
                 <StackPanel Width="Auto" Orientation="Horizontal">
                     <CheckBox
                         Name="StartMenuEnabled"
-                        Width="200"
+                        Width="220"
                         Margin="70,8,10,8"
                         Content="{DynamicResource flowlauncher_plugin_program_index_start}"
                         IsChecked="{Binding EnableStartMenuSource}"
@@ -42,7 +42,7 @@
                 <StackPanel Width="Auto" Orientation="Horizontal">
                     <CheckBox
                         Name="HideLnkEnabled"
-                        Width="200"
+                        Width="220"
                         Margin="70,8,10,8"
                         Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
                         IsChecked="{Binding HideAppsPath}"
@@ -66,21 +66,21 @@
                 Orientation="Horizontal">
                 <Button
                     x:Name="btnLoadAllProgramSource"
-                    Width="120"
+                    MinWidth="120"
                     Margin="10,10,5,10"
                     HorizontalAlignment="Right"
                     Click="btnLoadAllProgramSource_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_all_programs}" />
                 <Button
                     x:Name="btnProgramSuffixes"
-                    Width="120"
+                    MinWidth="120"
                     Margin="5,10,5,10"
                     HorizontalAlignment="Right"
                     Click="BtnProgramSuffixes_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_suffixes}" />
                 <Button
                     x:Name="btnReindex"
-                    Width="120"
+                    MinWidth="120"
                     Margin="5,10,5,10"
                     HorizontalAlignment="Right"
                     Click="btnReindex_Click"
@@ -119,14 +119,14 @@
             SelectionMode="Extended">
             <ListView.View>
                 <GridView>
-                    <GridViewColumn Width="150" Header="Name">
+                    <GridViewColumn Width="150" Header="{DynamicResource flowlauncher_plugin_program_name}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding Name}" />
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
-                    <GridViewColumn Header="Enabled">
+                    <GridViewColumn Header="{DynamicResource flowlauncher_plugin_program_enable}">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBlock
@@ -153,19 +153,19 @@
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button
                     x:Name="btnProgramSourceStatus"
-                    Width="100"
+                    MinWidth="100"
                     Margin="10"
                     Click="btnProgramSourceStatus_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_disable}" />
                 <Button
                     x:Name="btnEditProgramSource"
-                    Width="100"
+                    MinWidth="100"
                     Margin="10"
                     Click="btnEditProgramSource_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_edit}" />
                 <Button
                     x:Name="btnAddProgramSource"
-                    Width="100"
+                    MinWidth="100"
                     Margin="10,10,0,10"
                     Click="btnAddProgramSource_OnClick"
                     Content="{DynamicResource flowlauncher_plugin_program_add}" />