diff --git a/ModernKeePass/Controls/TextBoxWithButton.cs b/ModernKeePass/Controls/TextBoxWithButton.cs
index b0d8c3c..06d3475 100644
--- a/ModernKeePass/Controls/TextBoxWithButton.cs
+++ b/ModernKeePass/Controls/TextBoxWithButton.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Linq;
+using System.Reflection;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -6,6 +8,8 @@ namespace ModernKeePass.Controls
 {
     public class TextBoxWithButton : TextBox
     {
+        public event EventHandler<RoutedEventArgs> ButtonClick;
+
         public string ButtonSymbol
         {
             get { return (string)GetValue(ButtonSymbolProperty); }
@@ -17,7 +21,6 @@ namespace ModernKeePass.Controls
                 typeof(string),
                 typeof(TextBoxWithButton),
                 new PropertyMetadata("&#xE107;", (o, args) => { }));
-        public event EventHandler<RoutedEventArgs> ButtonClick;
 
         public string ButtonTooltip
         {
diff --git a/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml b/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
index b57a4ae..3ba21f0 100644
--- a/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
+++ b/ModernKeePass/ResourceDictionaries/TextBoxWithButtonStyle.xaml
@@ -87,6 +87,7 @@
                                                                VerticalAlignment="Center"
                                                                HorizontalAlignment="Center"
                                                                FontStyle="Normal"
+                                                               Padding="4,0,4,0"
                                                                Text="{TemplateBinding Content}"
                                                                FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                                                AutomationProperties.AccessibilityView="Raw"/>
@@ -141,7 +142,7 @@
                                                          Storyboard.TargetProperty="Opacity"
                                                          Duration="0"
                                                          To="{ThemeResource TextControlPointerOverBorderThemeOpacity}" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton"
                                                                        Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
@@ -153,7 +154,7 @@
                                 </VisualState>
                                 <VisualState x:Name="Focused">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton"
                                                                        Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
@@ -167,7 +168,7 @@
                             <VisualStateGroup x:Name="ButtonStates">
                                 <VisualState x:Name="ButtonVisible">
                                     <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DeleteButton"
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ActionButton"
                                                                        Storyboard.TargetProperty="Visibility">
                                             <DiscreteObjectKeyFrame KeyTime="0">
                                                 <DiscreteObjectKeyFrame.Value>
@@ -229,7 +230,7 @@
                                       Grid.ColumnSpan="2" Grid.Column="0"
                                       Content="{TemplateBinding PlaceholderText}" 
                                       IsHitTestVisible="False"/>
-                        <Button x:Name="DeleteButton"
+                        <Button x:Name="ActionButton"
                                 Grid.Row="1"
                                 Style="{StaticResource ActionButtonStyle}"
                                 BorderThickness="{TemplateBinding BorderThickness}"