diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
index 2f7d28212dd..187f99d1823 100644
--- a/Flow.Launcher/CustomQueryHotkeySetting.xaml
+++ b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -79,20 +79,18 @@
                 </StackPanel>
 
                 <StackPanel Margin="0,20,0,0" Orientation="Horizontal">
-                    <Grid>
+                    <Grid Width="470">
                         <Grid.RowDefinitions>
                             <RowDefinition />
                             <RowDefinition />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="0"
-                            Width="Auto"
-                            MinWidth="110"
                             Margin="10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
@@ -106,7 +104,7 @@
                                 x:Name="ctlHotkey"
                                 Grid.Column="1"
                                 Width="200"
-                                Height="34"
+                                Height="36"
                                 Margin="10,0,10,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
@@ -123,29 +121,27 @@
                         <TextBlock
                             Grid.Row="1"
                             Grid.Column="0"
-                            Width="Auto"
-                            MinWidth="110"
                             Margin="10"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource customQuery}" />
-                        <StackPanel
+                        <DockPanel
                             Grid.Row="1"
                             Grid.Column="1"
-                            Orientation="Horizontal">
-                            <TextBox
-                                x:Name="tbAction"
-                                MinWidth="220"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center" />
+                            LastChildFill="True">
                             <Button
                                 x:Name="btnTestActionKeyword"
                                 Padding="10,5,10,5"
                                 Click="BtnTestActionKeyword_OnClick"
-                                Content="{DynamicResource preview}" />
-                        </StackPanel>
+                                Content="{DynamicResource preview}"
+                                DockPanel.Dock="Right" />
+                            <TextBox
+                                x:Name="tbAction"
+                                Margin="10"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center" />
+                        </DockPanel>
                     </Grid>
                 </StackPanel>
             </StackPanel>
@@ -159,15 +155,13 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
-                    Width="100"
-                    Height="32"
+                    MinWidth="140"
                     Margin="10,0,5,0"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource cancel}" />
                 <Button
                     x:Name="btnAdd"
-                    Width="100"
-                    Height="32"
+                    MinWidth="140"
                     Margin="5,0,10,0"
                     Click="btnAdd_OnClick"
                     Style="{StaticResource AccentButtonStyle}">
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
index 516471ba3b3..ab524b70a10 100644
--- a/Flow.Launcher/Languages/en.xaml
+++ b/Flow.Launcher/Languages/en.xaml
@@ -15,6 +15,9 @@
     <system:String x:Key="iconTrayAbout">About</system:String>
     <system:String x:Key="iconTrayExit">Exit</system:String>
     <system:String x:Key="closeWindow">Close</system:String>
+    <system:String x:Key="copy">Copy</system:String>
+    <system:String x:Key="cut">Cut</system:String>
+    <system:String x:Key="paste">Paste</system:String>
     <system:String x:Key="GameMode">Game Mode</system:String>
     <system:String x:Key="GameModeToolTip">Suspend the use of Hotkeys.</system:String>
 
@@ -60,6 +63,7 @@
     <system:String x:Key="actionKeywords">Action keyword</system:String>
     <system:String x:Key="currentActionKeywords">Current action keyword</system:String>
     <system:String x:Key="newActionKeyword">New action keyword</system:String>
+    <system:String x:Key="actionKeywordsTooltip">Change Action Keywords</system:String>
     <system:String x:Key="currentPriority">Current Priority</system:String>
     <system:String x:Key="newPriority">New Priority</system:String>
     <system:String x:Key="priority">Priority</system:String>
diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
index 66d101a5a46..b26ce82fb0c 100644
--- a/Flow.Launcher/Languages/ko.xaml
+++ b/Flow.Launcher/Languages/ko.xaml
@@ -15,6 +15,9 @@
     <system:String x:Key="iconTrayAbout">정보</system:String>
     <system:String x:Key="iconTrayExit">종료</system:String>
     <system:String x:Key="closeWindow">닫기</system:String>
+    <system:String x:Key="copy">복사</system:String>
+    <system:String x:Key="cut">잘라내기</system:String>
+    <system:String x:Key="paste">붙여넣기</system:String>
     <system:String x:Key="GameMode">게임 모드</system:String>
     <system:String x:Key="GameModeToolTip">단축키 사용을 일시중단합니다.</system:String>
 
@@ -38,6 +41,8 @@
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">게이머라면 켜는 것을 추천합니다.</system:String>
     <system:String x:Key="defaultFileManager">기본 파일관리자</system:String>
     <system:String x:Key="defaultFileManagerToolTip">폴더를 열 때 사용할 파일관리자를 선택하세요.</system:String>
+    <system:String x:Key="defaultBrowser">기본 웹 브라우저</system:String>
+    <system:String x:Key="defaultBrowserToolTip">새 탭, 새 창, 프라이빗 모드 설정</system:String>
     <system:String x:Key="pythonDirectory">Python 디렉토리</system:String>
     <system:String x:Key="autoUpdates">자동 업데이트</system:String>
     <system:String x:Key="selectPythonDirectory">선택</system:String>
@@ -164,6 +169,16 @@
     <system:String x:Key="fileManager_directory_arg">폴더경로 인수</system:String>
     <system:String x:Key="fileManager_file_arg">파일경로 인수</system:String>
 
+    <!--  DefaultBrowser Setting Dialog  -->
+    <system:String x:Key="defaultBrowserTitle">기본 웹 브라우저r</system:String>
+    <system:String x:Key="defaultBrowser_tips">기본 설정은 OS의 브라우저 설정을 따릅니다. 별도 설정시 Flow Launcher가 해당 브라우저를 사용합니다.</system:String>
+    <system:String x:Key="defaultBrowser_name">브라우저</system:String>
+    <system:String x:Key="defaultBrowser_profile_name">브라우저 이름</system:String>
+    <system:String x:Key="defaultBrowser_path">브라우저 경로</system:String>
+    <system:String x:Key="defaultBrowser_newtab">새 창</system:String>
+    <system:String x:Key="defaultBrowser_newWindow">새 탭</system:String>
+    <system:String x:Key="defaultBrowser_parameter">프라이빗 모드</system:String>
+
     <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">중요도 변경</system:String>
     <system:String x:Key="priority_tips">높은 수를 넣을수록 상위 결과에 표시됩니다. 5를 시도해보세요. 다른 플러그인 보다 결과를 낮춰 표시하고 싶다면, 그보다 낮은 수를 입력하세요.</system:String>
diff --git a/Flow.Launcher/Languages/pt-pt.xaml b/Flow.Launcher/Languages/pt-pt.xaml
index 0bee02aced4..b14ed3c5d82 100644
--- a/Flow.Launcher/Languages/pt-pt.xaml
+++ b/Flow.Launcher/Languages/pt-pt.xaml
@@ -1,5 +1,8 @@
-<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--  MainWindow  -->
     <system:String x:Key="registerHotkeyFailed">Falha ao registar tecla de atalho: {0}</system:String>
     <system:String x:Key="couldnotStartCmd">Não foi possível iniciar {0}</system:String>
@@ -36,6 +39,8 @@
     <system:String x:Key="ignoreHotkeysOnFullscreenToolTip">Desativar ativação do Flow Launcher se alguma aplicação estiver em ecrã completo (recomendado para jogos)</system:String>
     <system:String x:Key="defaultFileManager">Gestor de ficheiros padrão</system:String>
     <system:String x:Key="defaultFileManagerToolTip">Selecione o gestor de ficheiros utilizado para abrir a página</system:String>
+    <system:String x:Key="defaultBrowser">Default Web Browser</system:String>
+    <system:String x:Key="defaultBrowserToolTip">Setting for New Tab, New Window, Private Mode.</system:String>
     <system:String x:Key="pythonDirectory">Diretório Python</system:String>
     <system:String x:Key="autoUpdates">Atualização automática</system:String>
     <system:String x:Key="selectPythonDirectory">Selecionar</system:String>
@@ -160,6 +165,16 @@
     <system:String x:Key="fileManager_directory_arg">Argumento para pasta</system:String>
     <system:String x:Key="fileManager_file_arg">Argumento para ficheiro</system:String>
 
+    <!--  DefaultBrowser Setting Dialog  -->
+    <system:String x:Key="defaultBrowserTitle">Default Web Browser</system:String>
+    <system:String x:Key="defaultBrowser_tips">The default setting follows the OS default browser setting. If specified separately, flow uses that browser.</system:String>
+    <system:String x:Key="defaultBrowser_name">Browser</system:String>
+    <system:String x:Key="defaultBrowser_profile_name">Browser Name</system:String>
+    <system:String x:Key="defaultBrowser_path">Browser Path</system:String>
+    <system:String x:Key="defaultBrowser_newtab">New Window</system:String>
+    <system:String x:Key="defaultBrowser_newWindow">New Tab</system:String>
+    <system:String x:Key="defaultBrowser_parameter">Priviate Mode</system:String>
+
     <!--  Priority Setting Dialog  -->
     <system:String x:Key="changePriorityWindow">Alterar prioridade</system:String>
     <system:String x:Key="priority_tips">Quanto maior for o número, melhor avaliação terá o resultado. Experimente com o número 5. Se quiser que os resultados sejam inferiores aos dos outros plugins, indique um número negativo.</system:String>
@@ -214,7 +229,7 @@
     <system:String x:Key="update_flowlauncher_updating">A atualizar...</system:String>
     <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">
         Flow Launcher não conseguiu mover o seu perfil de dados para a nova versão.
-Queira por favor mover a pasta do seu perfil de {0} para {1}
+        Queira por favor mover a pasta do seu perfil de {0} para {1}
     </system:String>
     <system:String x:Key="update_flowlauncher_new_update">Nova atualização</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">Está disponível a versão {0} do Flow Launcher</system:String>
diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml
index 129ceeea502..75120322f7e 100644
--- a/Flow.Launcher/MainWindow.xaml
+++ b/Flow.Launcher/MainWindow.xaml
@@ -41,9 +41,7 @@
         <KeyBinding Key="Escape" Command="{Binding EscCommand}" />
         <KeyBinding Key="F1" Command="{Binding StartHelpCommand}" />
         <KeyBinding Key="F5" Command="{Binding ReloadPluginDataCommand}" />
-        <KeyBinding
-            Key="Tab"
-            Command="{Binding AutocompleteQueryCommand}"/>
+        <KeyBinding Key="Tab" Command="{Binding AutocompleteQueryCommand}" />
         <KeyBinding
             Key="Tab"
             Command="{Binding AutocompleteQueryCommand}"
@@ -179,9 +177,9 @@
                         Visibility="Visible">
                         <TextBox.ContextMenu>
                             <ContextMenu>
-                                <MenuItem Command="ApplicationCommands.Cut" />
-                                <MenuItem Command="ApplicationCommands.Copy" />
-                                <MenuItem Command="ApplicationCommands.Paste" />
+                                <MenuItem Command="ApplicationCommands.Cut" Header="{DynamicResource cut}" />
+                                <MenuItem Command="ApplicationCommands.Copy" Header="{DynamicResource copy}" />
+                                <MenuItem Command="ApplicationCommands.Paste" Header="{DynamicResource paste}" />
                                 <Separator
                                     Margin="0"
                                     Padding="0,4,0,4"
diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml
index dd9dba391e0..a021d5de246 100644
--- a/Flow.Launcher/Resources/CustomControlTemplate.xaml
+++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml
@@ -1830,7 +1830,6 @@
     </Style>
 
     <Style BasedOn="{StaticResource DefaultToggleSwitch}" TargetType="{x:Type ui:ToggleSwitch}" />
-
     <!--#region Expander for Setting Window-->
     <Style x:Key="ExpanderRightHeaderStyle" TargetType="{x:Type ToggleButton}">
         <Setter Property="Template">
diff --git a/Flow.Launcher/SelectBrowserWindow.xaml b/Flow.Launcher/SelectBrowserWindow.xaml
index 3f0793c5322..cd4ae2b1426 100644
--- a/Flow.Launcher/SelectBrowserWindow.xaml
+++ b/Flow.Launcher/SelectBrowserWindow.xaml
@@ -86,8 +86,8 @@
                         Text="{DynamicResource defaultBrowser_name}" />
                     <ComboBox
                         Name="comboBox"
-                        Width="200"
                         Height="35"
+                        MinWidth="200"
                         Margin="14,0,0,0"
                         HorizontalAlignment="Left"
                         VerticalAlignment="Center"
@@ -121,8 +121,8 @@
                     Orientation="Horizontal">
                     <Grid Width="480">
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="150" />
-                            <ColumnDefinition />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="2*" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition />
@@ -133,7 +133,7 @@
                         <TextBlock
                             Grid.Row="0"
                             Grid.Column="0"
-                            Margin="14,5,0,0"
+                            Margin="14,5,10,0"
                             HorizontalAlignment="Left"
                             VerticalAlignment="Center"
                             FontSize="14"
@@ -143,7 +143,7 @@
                             Grid.Row="0"
                             Grid.Column="1"
                             Width="Auto"
-                            Margin="10,5,15,0"
+                            Margin="10,5,0,0"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="Center"
                             IsEnabled="{Binding Editable}"
@@ -156,21 +156,13 @@
                             VerticalAlignment="Center"
                             FontSize="14"
                             Text="{DynamicResource defaultBrowser_path}" />
-                        <StackPanel
+                        <DockPanel
                             Grid.Row="1"
                             Grid.Column="1"
-                            Orientation="Horizontal">
-                            <TextBox
-                                x:Name="PathTextBox"
-                                Width="220"
-                                Margin="10,10,5,0"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center"
-                                IsEnabled="{Binding Editable}"
-                                Text="{Binding Path}" />
+                            HorizontalAlignment="Stretch"
+                            LastChildFill="True">
                             <Button
                                 Name="btnBrowseFile"
-                                Width="80"
                                 Margin="0,10,0,0"
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Center"
@@ -187,7 +179,14 @@
                                     </Style>
                                 </Button.Style>
                             </Button>
-                        </StackPanel>
+                            <TextBox
+                                x:Name="PathTextBox"
+                                Margin="10,10,5,0"
+                                HorizontalAlignment="Stretch"
+                                VerticalAlignment="Center"
+                                IsEnabled="{Binding Editable}"
+                                Text="{Binding Path}" />
+                        </DockPanel>
 
                         <StackPanel
                             Grid.Row="2"
diff --git a/Flow.Launcher/SelectFileManagerWindow.xaml b/Flow.Launcher/SelectFileManagerWindow.xaml
index 7380baa6af2..a7cff90490d 100644
--- a/Flow.Launcher/SelectFileManagerWindow.xaml
+++ b/Flow.Launcher/SelectFileManagerWindow.xaml
@@ -123,7 +123,7 @@
                         Orientation="Horizontal">
                         <Grid Width="545">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="180" />
+                                <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
@@ -135,7 +135,7 @@
                             <TextBlock
                                 Grid.Row="0"
                                 Grid.Column="0"
-                                Margin="14,5,0,0"
+                                Margin="14,5,20,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -153,23 +153,14 @@
                             <TextBlock
                                 Grid.Row="1"
                                 Grid.Column="0"
-                                Margin="14,10,0,0"
+                                Margin="14,10,20,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
                                 Text="{DynamicResource fileManager_path}" />
                             <DockPanel Grid.Row="1" Grid.Column="1">
-                                <TextBox
-                                    x:Name="PathTextBox"
-                                    Width="250"
-                                    Margin="10,10,10,0"
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Center"
-                                    IsEnabled="{Binding Editable}"
-                                    Text="{Binding Path}" />
                                 <Button
                                     Name="btnBrowseFile"
-                                    Width="80"
                                     Margin="0,10,15,0"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Center"
@@ -186,11 +177,18 @@
                                         </Style>
                                     </Button.Style>
                                 </Button>
+                                <TextBox
+                                    x:Name="PathTextBox"
+                                    Margin="10,10,10,0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    IsEnabled="{Binding Editable}"
+                                    Text="{Binding Path}" />
                             </DockPanel>
                             <TextBlock
                                 Grid.Row="2"
                                 Grid.Column="0"
-                                Margin="14,10,0,0"
+                                Margin="14,10,20,0"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
@@ -209,7 +207,7 @@
                             <TextBlock
                                 Grid.Row="3"
                                 Grid.Column="0"
-                                Margin="14,10,0,20"
+                                Margin="14,10,20,20"
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 FontSize="14"
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index d8c94390ba7..e15d5285cd0 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -110,12 +110,12 @@
             </Setter>
         </Style>
 
-        <Style
-            x:Key="SideToggleSwitch"
-            BasedOn="{StaticResource DefaultToggleSwitch}"
-            TargetType="{x:Type ui:ToggleSwitch}">
+        <Style x:Key="SideToggleSwitch" TargetType="{x:Type ui:ToggleSwitch}">
             <Setter Property="Grid.Column" Value="2" />
-            <Setter Property="Margin" Value="0,4,0,4" />
+            <Setter Property="OffContent" Value="{DynamicResource disable}" />
+            <Setter Property="OnContent" Value="{DynamicResource enable}" />
+            <Setter Property="FlowDirection" Value="RightToLeft" />
+            <Setter Property="Margin" Value="0,4,22,4" />
         </Style>
 
         <Style x:Key="SideTextAbout" TargetType="{x:Type TextBlock}">
@@ -682,7 +682,6 @@
                                     </StackPanel>
                                     <ui:ToggleSwitch
                                         Grid.Column="2"
-                                        Width="100"
                                         FocusVisualMargin="5"
                                         IsOn="{Binding AutoUpdates}"
                                         Style="{DynamicResource SideToggleSwitch}" />
@@ -700,7 +699,6 @@
                                     </StackPanel>
                                     <ui:ToggleSwitch
                                         Grid.Column="2"
-                                        Width="100"
                                         FocusVisualMargin="5"
                                         IsOn="{Binding PortableMode}"
                                         Style="{DynamicResource SideToggleSwitch}" />
@@ -756,7 +754,6 @@
                                             </StackPanel>
                                             <ComboBox
                                                 Grid.Column="2"
-                                                MaxWidth="200"
                                                 Margin="10,0,18,0"
                                                 DisplayMemberPath="Display"
                                                 ItemsSource="{Binding LastQueryModes}"
@@ -951,13 +948,9 @@
                                                     FlowDirection="LeftToRight">
                                                     <Grid.ColumnDefinitions>
                                                         <ColumnDefinition Width="100" MinWidth="100" />
-                                                        <ColumnDefinition
-                                                            Width="*"
-                                                            MinWidth="350"
-                                                            MaxWidth="700" />
-                                                        <ColumnDefinition MaxWidth="1400" />
-                                                        <ColumnDefinition Width="100" />
-                                                        <ColumnDefinition Width="90" />
+                                                        <ColumnDefinition Width="3*" />
+                                                        <ColumnDefinition />
+                                                        <ColumnDefinition />
                                                     </Grid.ColumnDefinitions>
                                                     <StackPanel
                                                         Grid.Column="0"
@@ -984,9 +977,11 @@
                                                             <Run FontSize="12" Text="{Binding PluginPair.Metadata.Description}" />
                                                         </TextBlock>
                                                     </StackPanel>
-                                                    <StackPanel Grid.Column="3" Orientation="Horizontal">
+                                                    <StackPanel
+                                                        Grid.Column="2"
+                                                        HorizontalAlignment="Right"
+                                                        Orientation="Horizontal">
                                                         <TextBlock
-                                                            MaxWidth="100"
                                                             Margin="0,0,8,0"
                                                             VerticalAlignment="Center"
                                                             FontSize="12"
@@ -995,7 +990,7 @@
                                                         <Border>
                                                             <Button
                                                                 x:Name="PriorityButton"
-                                                                Margin="0,0,0,0"
+                                                                Margin="0,0,12,0"
                                                                 VerticalAlignment="Center"
                                                                 Click="OnPluginPriorityClick"
                                                                 Content="{Binding Priority, UpdateSourceTrigger=PropertyChanged}"
@@ -1025,13 +1020,13 @@
                                                             </Button>
                                                         </Border>
                                                     </StackPanel>
-                                                    <ui:ToggleSwitch
-                                                        Grid.Column="4"
-                                                        MaxWidth="110"
-                                                        HorizontalAlignment="Right"
-                                                        IsOn="{Binding PluginState}"
-                                                        OffContent="{DynamicResource disable}"
-                                                        OnContent="{DynamicResource enable}" />
+                                                    <DockPanel Grid.Column="3">
+                                                        <ui:ToggleSwitch
+                                                            Margin="0"
+                                                            DockPanel.Dock="Right"
+                                                            IsOn="{Binding PluginState}"
+                                                            Style="{DynamicResource SideToggleSwitch}" />
+                                                    </DockPanel>
                                                 </Grid>
 
                                             </Expander.Header>
@@ -1079,7 +1074,7 @@
                                                                         Cursor="Hand"
                                                                         DockPanel.Dock="Right"
                                                                         FontWeight="Bold"
-                                                                        ToolTip="Change Action Keywords"
+                                                                        ToolTip="{DynamicResource actionKeywordsTooltip}"
                                                                         Visibility="{Binding ActionKeywordsVisibility}" />
                                                                 </DockPanel>
 
@@ -1138,26 +1133,22 @@
                                                                     Orientation="Horizontal"
                                                                     Style="{StaticResource TextPanel}">
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="10,0,0,0"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource author}" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding PluginPair.Metadata.Author}" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="|" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
@@ -1169,33 +1160,28 @@
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding InitilizaTime}" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="|" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource plugin_query_time}" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{Binding QueryTime}" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         Text="{DynamicResource plugin_query_version}" />
                                                                     <TextBlock
-                                                                        MaxWidth="100"
                                                                         Margin="5,0,0,0"
                                                                         VerticalAlignment="Center"
                                                                         FontSize="11"
@@ -1203,12 +1189,11 @@
                                                                         Text="{Binding PluginPair.Metadata.Version}" />
 
                                                                     <TextBlock
-                                                                        MaxWidth="120"
                                                                         Margin="10,0,0,0"
                                                                         HorizontalAlignment="Right"
                                                                         VerticalAlignment="Center"
                                                                         Cursor="Hand"
-                                                                        FontSize="12">
+                                                                        FontSize="11">
                                                                         <Hyperlink
                                                                             Foreground="{DynamicResource PluginInfoColor}"
                                                                             NavigateUri="{Binding PluginPair.Metadata.Website}"
@@ -1218,12 +1203,11 @@
                                                                     </TextBlock>
 
                                                                     <TextBlock
-                                                                        MaxWidth="120"
                                                                         Margin="10,0,0,0"
                                                                         HorizontalAlignment="Right"
                                                                         VerticalAlignment="Center"
                                                                         Cursor="Hand"
-                                                                        FontSize="12"
+                                                                        FontSize="11"
                                                                         Foreground="{DynamicResource PluginInfoColor}"
                                                                         MouseUp="OnPluginDirecotyClick"
                                                                         Text="{DynamicResource pluginDirectory}"
@@ -1479,9 +1463,9 @@
                                                             <Button
                                                                 Name="ShortCutButtonPrev"
                                                                 Grid.Column="1"
-                                                                Width="90"
                                                                 MinHeight="40"
                                                                 Margin="0,0,0,0"
+                                                                Padding="15,5,15,5"
                                                                 HorizontalAlignment="Right"
                                                                 VerticalAlignment="Center"
                                                                 Click="OnExternalPluginInstallClick"
@@ -1606,9 +1590,10 @@
                                             <ui:ToggleSwitch
                                                 Grid.Row="0"
                                                 Grid.Column="2"
-                                                Width="100"
-                                                Margin="0,0,2,0"
-                                                IsOn="{Binding DropShadowEffect, Mode=TwoWay}" />
+                                                IsOn="{Binding DropShadowEffect, Mode=TwoWay}"
+                                                OffContent="{DynamicResource disable}"
+                                                OnContent="{DynamicResource enable}"
+                                                Style="{DynamicResource SideToggleSwitch}" />
                                             <TextBlock Style="{StaticResource Glyph}">
                                                 &#xeb91;
                                             </TextBlock>
@@ -1774,9 +1759,8 @@
                                                     <ui:ToggleSwitch
                                                         Grid.Row="0"
                                                         Grid.Column="2"
-                                                        Width="100"
-                                                        Margin="0,0,2,0"
-                                                        IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" />
+                                                        IsOn="{Binding UseGlyphIcons, Mode=TwoWay}"
+                                                        Style="{DynamicResource SideToggleSwitch}" />
                                                     <TextBlock Style="{StaticResource Glyph}">
                                                         &#xf6b8;
                                                     </TextBlock>
@@ -1905,9 +1889,10 @@
                                                         <ui:ToggleSwitch
                                                             Grid.Row="0"
                                                             Grid.Column="2"
-                                                            Width="100"
-                                                            Margin="0,0,2,0"
-                                                            IsOn="{Binding UseAnimation, Mode=TwoWay}" />
+                                                            IsOn="{Binding UseAnimation, Mode=TwoWay}"
+                                                            OffContent="{DynamicResource disable}"
+                                                            OnContent="{DynamicResource enable}"
+                                                            Style="{DynamicResource SideToggleSwitch}" />
                                                         <TextBlock Style="{StaticResource Glyph}">
                                                             &#xedb5;
                                                         </TextBlock>
@@ -1929,9 +1914,10 @@
                                                         <ui:ToggleSwitch
                                                             Grid.Row="0"
                                                             Grid.Column="2"
-                                                            Width="100"
-                                                            Margin="0,0,2,0"
-                                                            IsOn="{Binding UseSound, Mode=TwoWay}" />
+                                                            IsOn="{Binding UseSound, Mode=TwoWay}"
+                                                            OffContent="{DynamicResource disable}"
+                                                            OnContent="{DynamicResource enable}"
+                                                            Style="{DynamicResource SideToggleSwitch}" />
                                                         <TextBlock Style="{StaticResource Glyph}">
                                                             &#xe994;
                                                         </TextBlock>
@@ -1948,7 +1934,7 @@
                                                 <ComboBox
                                                     x:Name="ColorSchemeComboBox"
                                                     Grid.Column="2"
-                                                    Width="180"
+                                                    MinWidth="180"
                                                     Margin="0,0,18,0"
                                                     DisplayMemberPath="Display"
                                                     FontSize="14"
@@ -2149,23 +2135,22 @@
                                 </ListView>
                                 <StackPanel
                                     Grid.Row="5"
-                                    Width="350"
                                     Margin="0"
                                     HorizontalAlignment="Right"
                                     VerticalAlignment="Top"
                                     Orientation="Horizontal">
                                     <Button
-                                        Width="100"
+                                        MinWidth="100"
                                         Margin="10"
                                         Click="OnDeleteCustomHotkeyClick"
                                         Content="{DynamicResource delete}" />
                                     <Button
-                                        Width="100"
+                                        MinWidth="100"
                                         Margin="10"
                                         Click="OnnEditCustomHotkeyClick"
                                         Content="{DynamicResource edit}" />
                                     <Button
-                                        Width="100"
+                                        MinWidth="100"
                                         Margin="10,10,0,10"
                                         Click="OnAddCustomeHotkeyClick"
                                         Content="{DynamicResource add}" />
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/pt-pt.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/pt-pt.xaml
index 259f34c8549..a6e00ba92aa 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/pt-pt.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Languages/pt-pt.xaml
@@ -1,11 +1,15 @@
-<?xml version="1.0"?>
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:system="clr-namespace:System;assembly=mscorlib">
+<?xml version="1.0" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-	<!--Plugin Info-->
-	<system:String x:Key="flowlauncher_plugin_browserbookmark_plugin_name">Marcadores do navegador</system:String>
-	<system:String x:Key="flowlauncher_plugin_browserbookmark_plugin_description">Pesquisar nos marcadores do navegador</system:String>
+    <!--  Plugin Info  -->
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_plugin_name">Marcadores do navegador</system:String>
+    <system:String x:Key="flowlauncher_plugin_browserbookmark_plugin_description">Pesquisar nos marcadores do navegador</system:String>
 
-    <!--Settings-->
+    <!--  Settings  -->
+    <system:String x:Key="BookmarkDataSetting">Bookmmark Data</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_openBookmarks">Abrir marcadores em:</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_newWindow">Nova janela</system:String>
     <system:String x:Key="flowlauncher_plugin_browserbookmark_settings_newTab">Novo separador</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
index 8a2a65f2612..9e2bbb52e81 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml
@@ -6,10 +6,11 @@
     xmlns:local="clr-namespace:Flow.Launcher.Plugin.BrowserBookmark.Models"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     Title="{DynamicResource BookmarkDataSetting}"
-    Width="500"
+    Width="520"
     Background="{DynamicResource PopuBGColor}"
     Foreground="{DynamicResource PopupTextColor}"
     KeyDown="WindowKeyDown"
+    ResizeMode="NoResize"
     SizeToContent="Height"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
@@ -70,35 +71,50 @@
                         TextAlignment="Left" />
                 </StackPanel>
 
-                <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                    <TextBlock
-                        Width="140"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
-                    <TextBox
-                        Width="120"
-                        Height="30"
-                        Margin="50,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{Binding Name}" />
-                </StackPanel>
-                <StackPanel Margin="0,14,0,24" Orientation="Horizontal">
-                    <TextBlock
-                        Width="140"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        FontSize="14"
-                        Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
-                    <TextBox
-                        Width="250"
-                        Height="30"
-                        Margin="50,0,0,0"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Text="{Binding DataDirectoryPath}" />
+                <StackPanel Margin="0,10,0,20" Orientation="Horizontal">
+                    <Grid Width="444" HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock
+                            Grid.Row="0"
+                            Grid.Column="0"
+                            Margin="5,0,20,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserName}" />
+                        <TextBox
+                            Grid.Row="0"
+                            Grid.Column="1"
+                            Width="120"
+                            Height="34"
+                            Margin="5,0,10,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Text="{Binding Name}" />
+                        <TextBlock
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Margin="5,10,20,0"
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            FontSize="14"
+                            Text="{DynamicResource flowlauncher_plugin_browserbookmark_browserBookmarkDataDirectory}" />
+                        <TextBox
+                            Grid.Row="1"
+                            Grid.Column="1"
+                            Height="34"
+                            Margin="5,10,0,0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Center"
+                            Text="{Binding DataDirectoryPath}" />
+                    </Grid>
                 </StackPanel>
             </StackPanel>
         </StackPanel>
@@ -110,15 +126,13 @@
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
                     x:Name="btnCancel"
-                    Width="145"
-                    Height="30"
+                    MinWidth="145"
                     Margin="0,0,5,0"
                     Click="ConfirmCancelEditCustomBrowser"
                     Content="{DynamicResource cancel}" />
                 <Button
                     Name="btnConfirm"
-                    Width="145"
-                    Height="30"
+                    MinWidth="145"
                     Margin="5,0,0,0"
                     Click="ConfirmCancelEditCustomBrowser"
                     Style="{StaticResource AccentButtonStyle}">
diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
index 6762ca345c4..09ad2101bd6 100644
--- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
+++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml
@@ -33,12 +33,12 @@
             </ListView>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
                 <Button
-                    Width="110"
+                    MinWidth="120"
                     Margin="10"
                     Click="NewCustomBrowser"
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_addBrowserBookmark}" />
                 <Button
-                    Width="110"
+                    MinWidth="120"
                     Margin="10"
                     Click="DeleteCustomBrowser"
                     Content="{DynamicResource flowlauncher_plugin_browserbookmark_removeBrowserBookmark}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
index 01108895d3c..c0621a2d9b1 100644
--- a/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Calculator/Views/CalculatorSettings.xaml
@@ -1,58 +1,70 @@
-<UserControl x:Class="Flow.Launcher.Plugin.Caculator.Views.CalculatorSettings"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure"
-             xmlns:calculator="clr-namespace:Flow.Launcher.Plugin.Caculator"
-             xmlns:core="clr-namespace:Flow.Launcher.Core;assembly=Flow.Launcher.Core"
-             xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Caculator.ViewModels"
-             mc:Ignorable="d"
-             Loaded="CalculatorSettings_Loaded"
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="Flow.Launcher.Plugin.Caculator.Views.CalculatorSettings"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:calculator="clr-namespace:Flow.Launcher.Plugin.Caculator"
+    xmlns:core="clr-namespace:Flow.Launcher.Core;assembly=Flow.Launcher.Core"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ui="clr-namespace:Flow.Launcher.Infrastructure.UI;assembly=Flow.Launcher.Infrastructure"
+    xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Caculator.ViewModels"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    Loaded="CalculatorSettings_Loaded"
+    mc:Ignorable="d">
 
     <UserControl.Resources>
-        <core:LocalizationConverter x:Key="LocalizationConverter"/>
+        <core:LocalizationConverter x:Key="LocalizationConverter" />
     </UserControl.Resources>
 
-    <Grid Margin="20 14 0 14">
+    <Grid Margin="70,14,0,14">
         <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
-            <RowDefinition Height="auto"/>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="3*"/>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="3*" />
         </Grid.ColumnDefinitions>
 
-        <TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource flowlauncher_plugin_calculator_output_decimal_seperator}" 
-                   VerticalAlignment="Center" FontSize="14"/>
-        <ComboBox x:Name="DecimalSeparatorComboBox"
-                      Grid.Column="1"
-                      Grid.Row="0"
-                      Margin="10 5 0 5"
-                      HorizontalAlignment="Left"
-                      MaxWidth="300"
-                      SelectedItem="{Binding Settings.DecimalSeparator}"
-                      ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type calculator:DecimalSeparator}}}">
+        <TextBlock
+            Grid.Row="0"
+            Grid.Column="0"
+            Margin="0,0,10,0"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource flowlauncher_plugin_calculator_output_decimal_seperator}" />
+        <ComboBox
+            x:Name="DecimalSeparatorComboBox"
+            Grid.Row="0"
+            Grid.Column="1"
+            MaxWidth="300"
+            Margin="10,5,0,5"
+            HorizontalAlignment="Left"
+            ItemsSource="{Binding Source={ui:EnumBindingSource {x:Type calculator:DecimalSeparator}}}"
+            SelectedItem="{Binding Settings.DecimalSeparator}">
             <ComboBox.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding Converter={StaticResource LocalizationConverter}}" FontSize="14"/>
+                    <TextBlock FontSize="14" Text="{Binding Converter={StaticResource LocalizationConverter}}" />
                 </DataTemplate>
             </ComboBox.ItemTemplate>
         </ComboBox>
 
-        <TextBlock Grid.Column="0" Grid.Row="1" Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" 
-                   VerticalAlignment="Center" FontSize="14"/>
-        <ComboBox x:Name="MaxDecimalPlaces"
-                      Grid.Column="1"
-                      Grid.Row="1"
-                      Margin="10 5 0 5"
-                      HorizontalAlignment="Left"
-                      MaxWidth="300"
-                      SelectedItem="{Binding Settings.MaxDecimalPlaces}"
-                      ItemsSource="{Binding MaxDecimalPlacesRange}">
-        </ComboBox>
+        <TextBlock
+            Grid.Row="1"
+            Grid.Column="0"
+            Margin="0,0,10,0"
+            VerticalAlignment="Center"
+            FontSize="14"
+            Text="{DynamicResource flowlauncher_plugin_calculator_max_decimal_places}" />
+        <ComboBox
+            x:Name="MaxDecimalPlaces"
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="10,5,0,5"
+            HorizontalAlignment="Left"
+            ItemsSource="{Binding MaxDecimalPlacesRange}"
+            SelectedItem="{Binding Settings.MaxDecimalPlaces}" />
 
     </Grid>
 </UserControl>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
index ce8ecb6fff3..bbaacc18c72 100644
--- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml
@@ -103,7 +103,7 @@
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="350" />
+                <ColumnDefinition Width="450" />
             </Grid.ColumnDefinitions>
             <StackPanel
                 Grid.Row="1"
@@ -112,7 +112,7 @@
                 Orientation="Horizontal">
                 <Button
                     x:Name="btnIndexingOptions"
-                    Width="130"
+                    MinWidth="130"
                     Margin="10"
                     Click="btnOpenIndexingOptions_Click"
                     Content="{DynamicResource plugin_explorer_manageindexoptions}" />
@@ -124,19 +124,19 @@
                 Orientation="Horizontal">
                 <Button
                     x:Name="btnDelete"
-                    Width="100"
+                    MinWidth="100"
                     Margin="10"
                     Click="btnDelete_Click"
                     Content="{DynamicResource plugin_explorer_delete}" />
                 <Button
                     x:Name="btnEdit"
-                    Width="100"
+                    MinWidth="100"
                     Margin="10"
                     Click="btnEdit_Click"
                     Content="{DynamicResource plugin_explorer_edit}" />
                 <Button
                     x:Name="btnAdd"
-                    Width="100"
+                    MinWidth="100"
                     Margin="10"
                     Click="btnAdd_Click"
                     Content="{DynamicResource plugin_explorer_add}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml
index 90e61328027..9e093b7a5d8 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 b8ad553ed2c..8d8cae02c9f 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 5af43867b05..470e9e2e7aa 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 87fd89ca9f4..f078794654b 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}" />
diff --git a/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml b/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
index d9b1942f1c1..39fb21c59cb 100644
--- a/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.Shell/ShellSetting.xaml
@@ -1,28 +1,57 @@
-<UserControl x:Class="Flow.Launcher.Plugin.Shell.CMDSetting"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d" 
-             Loaded="CMDSetting_OnLoaded"
-             d:DesignHeight="300" d:DesignWidth="300">
-    <Grid Margin="7,10" VerticalAlignment="Top" >
+<UserControl
+    x:Class="Flow.Launcher.Plugin.Shell.CMDSetting"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="300"
+    d:DesignWidth="300"
+    Loaded="CMDSetting_OnLoaded"
+    mc:Ignorable="d">
+    <Grid Margin="60,10,10,20" VerticalAlignment="Top">
         <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition/>
-            <RowDefinition/>
-            <RowDefinition/>
-            <RowDefinition/>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
         </Grid.RowDefinitions>
-        <CheckBox Grid.Row="0" x:Name="ReplaceWinR" Content="{DynamicResource flowlauncher_plugin_cmd_relace_winr}" Margin="10" HorizontalAlignment="Left"/>
-        <CheckBox Grid.Row="1" x:Name="LeaveShellOpen" Content="{DynamicResource flowlauncher_plugin_cmd_leave_cmd_open}" Margin="10" HorizontalAlignment="Left"/>
-        <CheckBox Grid.Row="2" x:Name="AlwaysRunAsAdministrator" Content="{DynamicResource flowlauncher_plugin_cmd_always_run_as_administrator}" Margin="10" HorizontalAlignment="Left"/>
-        <ComboBox Grid.Row="3" x:Name="ShellComboBox" Margin="10" HorizontalAlignment="Left" >
+        <CheckBox
+            x:Name="ReplaceWinR"
+            Grid.Row="0"
+            Margin="10,10,5,5"
+            HorizontalAlignment="Left"
+            Content="{DynamicResource flowlauncher_plugin_cmd_relace_winr}" />
+        <CheckBox
+            x:Name="LeaveShellOpen"
+            Grid.Row="1"
+            Margin="10,5,5,5"
+            HorizontalAlignment="Left"
+            Content="{DynamicResource flowlauncher_plugin_cmd_leave_cmd_open}" />
+        <CheckBox
+            x:Name="AlwaysRunAsAdministrator"
+            Grid.Row="2"
+            Margin="10,5,5,5"
+            HorizontalAlignment="Left"
+            Content="{DynamicResource flowlauncher_plugin_cmd_always_run_as_administrator}" />
+        <ComboBox
+            x:Name="ShellComboBox"
+            Grid.Row="3"
+            Margin="10,5,5,5"
+            HorizontalAlignment="Left">
             <ComboBoxItem>CMD</ComboBoxItem>
             <ComboBoxItem>PowerShell</ComboBoxItem>
             <ComboBoxItem>RunCommand</ComboBoxItem>
         </ComboBox>
-        <CheckBox Grid.Row ="4" x:Name="ShowOnlyMostUsedCMDs" Content="{DynamicResource flowlauncher_plugin_cmd_history}" Margin="10 10 0 0"/>
-        <ComboBox Grid.Row="4" x:Name="ShowOnlyMostUsedCMDsNumber" Margin="330 20 10 10" HorizontalAlignment="Left" />
+        <StackPanel Grid.Row="4" Orientation="Horizontal">
+            <CheckBox
+                x:Name="ShowOnlyMostUsedCMDs"
+                Margin="10,5,5,5"
+                Content="{DynamicResource flowlauncher_plugin_cmd_history}" />
+            <ComboBox
+                x:Name="ShowOnlyMostUsedCMDsNumber"
+                Margin="10,5,5,5"
+                HorizontalAlignment="Left" />
+        </StackPanel>
     </Grid>
 </UserControl>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
index 12228853d18..f36db153d1d 100644
--- a/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
+++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SearchSourceSetting.xaml
@@ -69,7 +69,7 @@
                                 Text="{DynamicResource flowlauncher_plugin_websearch_window_title}"
                                 TextAlignment="Left" />
                         </StackPanel>
-                        <StackPanel Orientation="Vertical">
+                        <StackPanel>
                             <TextBlock
                                 FontSize="14"
                                 Text="{DynamicResource flowlauncher_plugin_websearch_guide_1}"
@@ -90,96 +90,103 @@
                                 TextWrapping="WrapWithOverflow" />
                         </StackPanel>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Width="100"
-                                Margin="10"
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
-                            <TextBox
-                                Width="330"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{Binding SearchSource.Title}" />
-
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Grid.Row="4"
-                                Grid.Column="0"
-                                Width="100"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
-                            <Button
-                                Height="35"
-                                Margin="10,0,0,0"
-                                VerticalAlignment="Center"
-                                Click="OnSelectIconClick"
-                                Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
-                            <Image
-                                Name="imgPreviewIcon"
-                                Width="24"
-                                Height="24"
-                                Margin="14,0,0,0"
-                                VerticalAlignment="Center" />
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Width="100"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
-                            <TextBox
-                                Grid.Row="1"
-                                Grid.Column="1"
-                                Width="330"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{Binding SearchSource.Url}" />
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                Width="100"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
-                            <TextBox
-                                Grid.Row="2"
-                                Grid.Column="1"
-                                Width="330"
-                                Margin="10,0,10,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{Binding SearchSource.ActionKeyword}" />
-                        </StackPanel>
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock
-                                Grid.Row="3"
-                                Grid.Column="0"
-                                Width="100"
-                                Margin="10"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                FontSize="14"
-                                Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
-                            <CheckBox
-                                Grid.Row="3"
-                                Grid.Column="1"
-                                Margin="10"
-                                VerticalAlignment="Center"
-                                IsChecked="{Binding SearchSource.Enabled}" />
+                            <Grid Width="500">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Margin="10,10,15,10"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Text="{DynamicResource flowlauncher_plugin_websearch_title}" />
+                                <TextBox
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Margin="10"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding SearchSource.Title}" />
+                                <TextBlock
+                                    Grid.Row="1"
+                                    Grid.Column="0"
+                                    Margin="10,10,15,10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Text="{DynamicResource flowlauncher_plugin_websearch_icon}" />
+                                <StackPanel
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Orientation="Horizontal">
+                                    <Button
+                                        Height="35"
+                                        Margin="10,0,0,0"
+                                        VerticalAlignment="Center"
+                                        Click="OnSelectIconClick"
+                                        Content="{DynamicResource flowlauncher_plugin_websearch_select_icon}" />
+                                    <Image
+                                        Name="imgPreviewIcon"
+                                        Width="24"
+                                        Height="24"
+                                        Margin="14,0,0,0"
+                                        VerticalAlignment="Center" />
+                                </StackPanel>
+                                <TextBlock
+                                    Grid.Row="2"
+                                    Grid.Column="0"
+                                    Margin="10,10,15,10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Text="{DynamicResource flowlauncher_plugin_websearch_url}" />
+                                <TextBox
+                                    Grid.Row="2"
+                                    Grid.Column="1"
+                                    Margin="10"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding SearchSource.Url}" />
+                                <TextBlock
+                                    Grid.Row="3"
+                                    Grid.Column="0"
+                                    Margin="10,10,15,10"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Text="{DynamicResource flowlauncher_plugin_websearch_action_keyword}" />
+                                <TextBox
+                                    Grid.Row="3"
+                                    Grid.Column="1"
+                                    Margin="10,0,10,0"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding SearchSource.ActionKeyword}" />
+                                <TextBlock
+                                    Grid.Row="4"
+                                    Grid.Column="0"
+                                    Margin="10,10,15,15"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    FontSize="14"
+                                    Text="{DynamicResource flowlauncher_plugin_websearch_enable}" />
+                                <CheckBox
+                                    Grid.Row="4"
+                                    Grid.Column="1"
+                                    Margin="10,10,10,15"
+                                    VerticalAlignment="Center"
+                                    IsChecked="{Binding SearchSource.Enabled}" />
+                            </Grid>
                         </StackPanel>
                     </StackPanel>
                 </Grid>
@@ -192,15 +199,16 @@
             BorderThickness="0,1,0,0">
             <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
                 <Button
-                    Width="100"
+                    MinWidth="140"
                     Margin="10,0,5,0"
                     Click="OnCancelButtonClick"
                     Content="{DynamicResource flowlauncher_plugin_websearch_cancel}" />
                 <Button
-                    Width="100"
+                    MinWidth="140"
                     Margin="5,0,10,0"
                     Click="OnConfirmButtonClick"
-                    Content="{DynamicResource flowlauncher_plugin_websearch_confirm}" />
+                    Content="{DynamicResource flowlauncher_plugin_websearch_confirm}"
+                    Style="{DynamicResource AccentButtonStyle}" />
             </StackPanel>
         </Border>
     </Grid>
diff --git a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/Resources.ko-KR.resx b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/Resources.ko-KR.resx
index e5859a469ce..ccfee5aef2c 100644
--- a/Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/Resources.ko-KR.resx
+++ b/Plugins/Flow.Launcher.Plugin.WindowsSettings/Properties/Resources.ko-KR.resx
@@ -112,10 +112,10 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="About" xml:space="preserve">
     <value>정보</value>
@@ -931,7 +931,7 @@
     <value>게임 전체 화면 재생</value>
   </data>
   <data name="PluginDescription" xml:space="preserve">
-    <value>Windows 설정을 검색하는 플러그 인</value>
+    <value>Windows 설정을 검색하는 플러그인</value>
   </data>
   <data name="PluginTitle" xml:space="preserve">
     <value>Windows 설정</value>