diff --git a/src/Views/AddRemote.axaml b/src/Views/AddRemote.axaml
index 4b460d79..aeef9fa0 100644
--- a/src/Views/AddRemote.axaml
+++ b/src/Views/AddRemote.axaml
@@ -41,17 +41,19 @@
 					       Margin="0,0,8,0"
 					       Text="{DynamicResource Text.SSHKey}"
                  IsVisible="{Binding UseSSH}"/>
-      <Grid Grid.Row="2" Grid.Column="2" Height="32" ColumnDefinitions="*,Auto" IsVisible="{Binding UseSSH}">
-        <TextBox Grid.Column="0"
-                 x:Name="txtSSHKey"
-                 Height="26"
-                 CornerRadius="3"
-                 Watermark="{DynamicResource Text.SSHKey.Placeholder}"
-                 Text="{Binding SSHKey, Mode=TwoWay}"/>
-        <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectSSHKey">
-          <Path Data="{StaticResource Icons.Folder.Open}"/>
-        </Button>
-      </Grid>
+      <TextBox Grid.Row="2" Grid.Column="1"
+               x:Name="txtSSHKey"
+               Height="28"
+               CornerRadius="3"
+               IsVisible="{Binding UseSSH}"
+               Watermark="{DynamicResource Text.SSHKey.Placeholder}"
+               Text="{Binding SSHKey, Mode=TwoWay}">
+        <TextBox.InnerRightContent>
+          <Button Classes="icon_button" Width="30" Height="30" Click="SelectSSHKey">
+            <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+          </Button>
+        </TextBox.InnerRightContent>
+      </TextBox>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml
index 979741c8..2f9b4ae8 100644
--- a/src/Views/Apply.axaml
+++ b/src/Views/Apply.axaml
@@ -18,17 +18,18 @@
 					       HorizontalAlignment="Right" VerticalAlignment="Center"
 					       Margin="0,0,8,0"
 					       Text="{DynamicResource Text.Apply.File}"/>
-      <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="*,Auto">
-        <TextBox Grid.Column="0"
-                 x:Name="txtPatchFile"
-                 Height="28"
-                 CornerRadius="3"
-                 Watermark="{DynamicResource Text.Apply.File.Placeholder}"
-                 Text="{Binding PatchFile, Mode=TwoWay}"/>
-        <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectPatchFile">
-          <Path Data="{StaticResource Icons.Folder.Open}"/>
-        </Button>
-      </Grid>
+      <TextBox Grid.Row="0" Grid.Column="1"
+               x:Name="txtPatchFile"
+               Height="28"
+               CornerRadius="3"
+               Watermark="{DynamicResource Text.Apply.File.Placeholder}"
+               Text="{Binding PatchFile, Mode=TwoWay}">
+        <TextBox.InnerRightContent>
+          <Button Classes="icon_button" Width="30" Height="30" Click="SelectPatchFile">
+            <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+          </Button>
+        </TextBox.InnerRightContent>
+      </TextBox>
 
       <TextBlock Grid.Row="1" Grid.Column="0"
 					       HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/Views/Archive.axaml b/src/Views/Archive.axaml
index df9de0a8..04c8dd9f 100644
--- a/src/Views/Archive.axaml
+++ b/src/Views/Archive.axaml
@@ -47,17 +47,18 @@
 					       HorizontalAlignment="Right" VerticalAlignment="Center"
 					       Margin="0,0,8,0"
 					       Text="{DynamicResource Text.Archive.File}"/>
-      <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="*,Auto">
-        <TextBox Grid.Column="0"
-                 x:Name="txtSaveFile"
-                 Height="28"
-                 CornerRadius="3"
-                 Watermark="{DynamicResource Text.Archive.File.Placeholder}"
-                 Text="{Binding SaveFile, Mode=TwoWay}"/>
-        <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectOutputFile">
-          <Path Data="{StaticResource Icons.Folder.Open}"/>
-        </Button>
-      </Grid>
+      <TextBox Grid.Row="1" Grid.Column="1"
+               x:Name="txtSaveFile"
+               Height="28"
+               CornerRadius="3"
+               Watermark="{DynamicResource Text.Archive.File.Placeholder}"
+               Text="{Binding SaveFile, Mode=TwoWay}">
+        <TextBox.InnerRightContent>
+          <Button Classes="icon_button" Width="30" Height="30" Click="SelectOutputFile">
+            <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+          </Button>
+        </TextBox.InnerRightContent>
+      </TextBox>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Clone.axaml b/src/Views/Clone.axaml
index ca3a4d3f..3a00e618 100644
--- a/src/Views/Clone.axaml
+++ b/src/Views/Clone.axaml
@@ -17,30 +17,32 @@
     </Grid>
     <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="120,*" IsVisible="{Binding UseSSH}">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.SSHKey}"/>
-      <Grid Grid.Column="1" ColumnDefinitions="*,Auto">
-        <TextBox Grid.Column="0"
-                 x:Name="txtSSHKey"
-                 Height="28"
-                 CornerRadius="3"
-                 Watermark="{DynamicResource Text.SSHKey.Placeholder}"
-                 Text="{Binding SSHKey, Mode=TwoWay}"/>
-        <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectSSHKey">
-          <Path Data="{StaticResource Icons.Folder.Open}"/>
-        </Button>
-      </Grid>
+      <TextBox Grid.Column="1"
+               x:Name="txtSSHKey"
+               Height="28"
+               CornerRadius="3"
+               Watermark="{DynamicResource Text.SSHKey.Placeholder}"
+               Text="{Binding SSHKey, Mode=TwoWay}">
+        <TextBox.InnerRightContent>
+          <Button Classes="icon_button" Width="30" Height="30" Click="SelectSSHKey">
+            <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+          </Button>
+        </TextBox.InnerRightContent>
+      </TextBox>
     </Grid>
     <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.Clone.ParentFolder}"/>
-      <Grid Grid.Column="1" ColumnDefinitions="*,Auto">
-        <TextBox Grid.Column="0"
-                 x:Name="txtParentFolder"
-                 Height="28"
-                 CornerRadius="3"
-                 Text="{Binding ParentFolder, Mode=TwoWay}"/>
-        <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectParentFolder">
-          <Path Data="{StaticResource Icons.Folder.Open}"/>
-        </Button>
-      </Grid>
+      <TextBox Grid.Column="1"
+               x:Name="txtParentFolder"
+               Height="28"
+               CornerRadius="3"
+               Text="{Binding ParentFolder, Mode=TwoWay}">
+        <TextBox.InnerRightContent>
+          <Button Classes="icon_button" Width="30" Height="30" Margin="4,0,0,0" Click="SelectParentFolder">
+            <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+          </Button>
+        </TextBox.InnerRightContent>
+      </TextBox>
     </Grid>
     <Grid Margin="8,4,0,0" Height="28" ColumnDefinitions="120,*">
       <TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="0,0,8,0" Text="{DynamicResource Text.Clone.LocalName}"/>
diff --git a/src/Views/EditRemote.axaml b/src/Views/EditRemote.axaml
index d1df2f96..6c41b3dc 100644
--- a/src/Views/EditRemote.axaml
+++ b/src/Views/EditRemote.axaml
@@ -41,17 +41,19 @@
 					       Margin="0,0,8,0"
 					       Text="{DynamicResource Text.SSHKey}"
                  IsVisible="{Binding UseSSH}"/>
-      <Grid Grid.Row="2" Grid.Column="2" Height="32" ColumnDefinitions="*,Auto" IsVisible="{Binding UseSSH}">
-        <TextBox Grid.Column="0"
-                 x:Name="txtSSHKey"
-                 Height="26"
-                 CornerRadius="3"
-                 Watermark="{DynamicResource Text.SSHKey.Placeholder}"
-                 Text="{Binding SSHKey, Mode=TwoWay}"/>
-        <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectSSHKey">
-          <Path Data="{StaticResource Icons.Folder.Open}"/>
-        </Button>
-      </Grid>
+      <TextBox Grid.Row="2" Grid.Column="1"
+               x:Name="txtSSHKey"
+               Height="26"
+               CornerRadius="3"
+               IsVisible="{Binding UseSSH}"
+               Watermark="{DynamicResource Text.SSHKey.Placeholder}"
+               Text="{Binding SSHKey, Mode=TwoWay}">
+        <TextBox.InnerRightContent>
+          <Button Classes="icon_button" Width="30" Height="30" Click="SelectSSHKey">
+            <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+          </Button>
+        </TextBox.InnerRightContent>
+      </TextBox>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 364bf5a4..19e4d65b 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -151,15 +151,16 @@
                      Text="{DynamicResource Text.Preference.Git.Path}"
                      HorizontalAlignment="Right"
                      Margin="0,0,16,0"/>
-          <Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="*,Auto">
-            <TextBox Grid.Column="0"
-                     Height="28"
-                     CornerRadius="3"
-                     Text="{Binding GitInstallPath, Mode=TwoWay}"/>
-            <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectGitExecutable">
-              <Path Data="{StaticResource Icons.Folder.Open}"/>
-            </Button>
-          </Grid>
+          <TextBox Grid.Row="0" Grid.Column="1"
+                   Height="28"
+                   CornerRadius="3"
+                   Text="{Binding GitInstallPath, Mode=TwoWay}">
+            <TextBox.InnerRightContent>
+              <Button Classes="icon_button" Width="30" Height="30" Click="SelectGitExecutable">
+                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+              </Button>
+            </TextBox.InnerRightContent>
+          </TextBox>
 
           <TextBlock Grid.Row="1" Grid.Column="0"
                      Text="{DynamicResource Text.Preference.Git.Version}"
@@ -172,15 +173,16 @@
                      Text="{DynamicResource Text.Preference.Git.DefaultCloneDir}"
                      HorizontalAlignment="Right"
                      Margin="0,0,16,0"/>
-          <Grid Grid.Row="2" Grid.Column="1" ColumnDefinitions="*,Auto">
-            <TextBox Grid.Column="0"
-                     Height="28"
-                     CornerRadius="3"
-                     Text="{Binding GitDefaultCloneDir, Mode=TwoWay}"/>
-            <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectDefaultCloneDir">
-              <Path Data="{StaticResource Icons.Folder.Open}"/>
-            </Button>
-          </Grid>
+          <TextBox Grid.Row="2" Grid.Column="1"
+                   Height="28"
+                   CornerRadius="3"
+                   Text="{Binding GitDefaultCloneDir, Mode=TwoWay}">
+            <TextBox.InnerRightContent>
+              <Button Classes="icon_button" Width="30" Height="30" Click="SelectDefaultCloneDir">
+                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+              </Button>
+            </TextBox.InnerRightContent>
+          </TextBox>
 
           <TextBlock Grid.Row="3" Grid.Column="0"
                      Text="{DynamicResource Text.Preference.Git.User}"
@@ -245,16 +247,17 @@
                      Text="{DynamicResource Text.Preference.GPG.Path}"
                      HorizontalAlignment="Right"
                      Margin="0,0,16,0"/>
-          <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="*,Auto">
-            <TextBox Grid.Column="0"
-                     x:Name="txtGPGExecutable"
-                     Height="28"
-                     CornerRadius="3"
-                     Text="{Binding #me.GPGExecutableFile, Mode=TwoWay}"/>
-            <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectGPGExecutable">
-              <Path Data="{StaticResource Icons.Folder.Open}"/>
-            </Button>
-          </Grid>
+          <TextBox Grid.Row="1" Grid.Column="1"
+                   x:Name="txtGPGExecutable"
+                   Height="28"
+                   CornerRadius="3"
+                   Text="{Binding #me.GPGExecutableFile, Mode=TwoWay}">
+            <TextBox.InnerRightContent>
+              <Button Classes="icon_button" Width="30" Height="30" Click="SelectGPGExecutable">
+                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+              </Button>
+            </TextBox.InnerRightContent>
+          </TextBox>
 
           <TextBlock Grid.Row="2" Grid.Column="0"
                      Text="{DynamicResource Text.Preference.GPG.UserKey}"
@@ -290,15 +293,16 @@
                      Text="{DynamicResource Text.Preference.Merger.Path}"
                      HorizontalAlignment="Right"
                      Margin="0,0,16,0"/>
-          <Grid Grid.Row="1" Grid.Column="1" ColumnDefinitions="*,Auto">
-            <TextBox Grid.Column="0"
-                     Height="28"
-                     CornerRadius="3"
-                     Text="{Binding ExternalMergeToolPath, Mode=TwoWay}"/>
-            <Button Grid.Column="1" Classes="icon_button" Width="32" Height="32" Margin="4,0,0,0" Click="SelectExternalMergeTool">
-              <Path Data="{StaticResource Icons.Folder.Open}"/>
-            </Button>
-          </Grid>
+          <TextBox Grid.Row="1" Grid.Column="1"
+                   Height="28"
+                   CornerRadius="3"
+                   Text="{Binding ExternalMergeToolPath, Mode=TwoWay}">
+            <TextBox.InnerRightContent>
+              <Button Classes="icon_button" Width="30" Height="30" Click="SelectExternalMergeTool">
+                <Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+              </Button>
+            </TextBox.InnerRightContent>
+          </TextBox>
 
           <TextBlock Grid.Row="2" Grid.Column="0"
                      Text="{DynamicResource Text.Preference.Merger.CustomMergeCmd}"