diff --git a/ModernKeePass/Strings/en-US/Resources.resw b/ModernKeePass/Strings/en-US/Resources.resw
index 35e1383..6cfec9e 100644
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
@@ -385,13 +385,13 @@
     <value>History</value>
   </data>
   <data name="ToastCopyLogin.Message" xml:space="preserve">
-    <value>Login successfully copied!</value>
+    <value>Login copied to clipboard</value>
   </data>
   <data name="ToastCopyPassword.Message" xml:space="preserve">
-    <value>Password successfully copied!</value>
+    <value>Password copied to clipboard</value>
   </data>
   <data name="ToastCopyUrl.Message" xml:space="preserve">
-    <value>URL successfully copied!</value>
+    <value>URL copied to clipboard</value>
   </data>
   <data name="EntryBackgroundColor.Text" xml:space="preserve">
     <value>Background color</value>
diff --git a/ModernKeePass/Strings/fr-FR/Resources.resw b/ModernKeePass/Strings/fr-FR/Resources.resw
index 9ff8d54..20c4210 100644
--- a/ModernKeePass/Strings/fr-FR/Resources.resw
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
@@ -385,13 +385,13 @@
     <value>Historique</value>
   </data>
   <data name="ToastCopyLogin.Message" xml:space="preserve">
-    <value>Login copié avec succès !</value>
+    <value>Login copié dans le presse-papiers</value>
   </data>
   <data name="ToastCopyPassword.Message" xml:space="preserve">
-    <value>Mot de passe copié avec succès !</value>
+    <value>Mot de passe copié dans le presse-papiers</value>
   </data>
   <data name="ToastCopyUrl.Message" xml:space="preserve">
-    <value>URL copié avec succès !</value>
+    <value>URL copié dans le presse-papiers</value>
   </data>
   <data name="EntryBackgroundColor.Text" xml:space="preserve">
     <value>Couleur d'arrière plan</value>
diff --git a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
index ab85174..e5bdfe5 100644
--- a/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/TopMenuUserControl.xaml
@@ -5,23 +5,34 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
+    <UserControl.Resources>
+        <Style BasedOn="{StaticResource NoBorderButtonStyle}" TargetType="Button" x:Key="MenuButtonStyle" >
+            <Setter Property="Padding" Value="25,0,25,0" />
+            <Setter Property="Background" Value="{ThemeResource ToggleButtonBackgroundThemeBrush}" />
+            <Setter Property="Height" Value="{StaticResource MenuSize}" />
+        </Style>
+        <Style BasedOn="{StaticResource NoBorderToggleButtonStyle}" TargetType="ToggleButton" x:Key="MenuToggleButtonStyle" >
+            <Setter Property="Padding" Value="25,0,25,0" />
+            <Setter Property="Height" Value="{StaticResource MenuSize}" />
+        </Style>
+    </UserControl.Resources>
     <StackPanel Orientation="Horizontal">
         <StackPanel Orientation="Horizontal" Visibility="{Binding OverflowButtonsVisibility, ElementName=UserControl}">
-            <Button Command="{Binding RestoreCommand, ElementName=UserControl}" Visibility="{Binding RestoreButtonVisibility, ElementName=UserControl}" IsEnabled="{Binding IsRestoreButtonEnabled,ElementName=UserControl}" Click="RestoreButton_Click" Style="{StaticResource NoBorderButtonStyle}" Background="{ThemeResource ToggleButtonBackgroundThemeBrush}" Height="{StaticResource MenuSize}" Padding="25,0,25,0">
+            <Button Command="{Binding RestoreCommand, ElementName=UserControl}" Visibility="{Binding RestoreButtonVisibility, ElementName=UserControl}" IsEnabled="{Binding IsRestoreButtonEnabled,ElementName=UserControl}" Click="RestoreButton_Click" Style="{StaticResource MenuButtonStyle}">
                 <SymbolIcon Symbol="Undo">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuRestoreButton" />
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
             </Button>
-            <Button Command="{Binding SaveCommand, ElementName=UserControl}" Style="{StaticResource NoBorderButtonStyle}" Background="{ThemeResource ToggleButtonBackgroundThemeBrush}" Height="{StaticResource MenuSize}" Padding="25,0,25,0">
+            <Button Command="{Binding SaveCommand, ElementName=UserControl}" Style="{StaticResource MenuButtonStyle}">
                 <SymbolIcon Symbol="Save">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuSaveButton" />
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
             </Button>
-            <Button Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" Style="{StaticResource NoBorderButtonStyle}" Background="{ThemeResource ToggleButtonBackgroundThemeBrush}" Height="{StaticResource MenuSize}" Padding="25,0,25,0">
+            <Button Visibility="{Binding SortButtonVisibility, ElementName=UserControl}" Style="{StaticResource MenuButtonStyle}">
                 <SymbolIcon Symbol="Sort">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuSortButton" />
@@ -34,14 +45,14 @@
                     </MenuFlyout>
                 </Button.Flyout>
             </Button>
-            <ToggleButton Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Checked="EditButton_Click" Style="{StaticResource NoBorderToggleButtonStyle}" Height="{StaticResource MenuSize}" Padding="25,0,25,0">
+            <ToggleButton Command="{Binding EditCommand, ElementName=UserControl}" IsChecked="{Binding IsEditButtonChecked, ElementName=UserControl, Mode=TwoWay}" Checked="EditButton_Click" Style="{StaticResource MenuToggleButtonStyle}">
                 <SymbolIcon Symbol="Edit">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuEditButton" />
                     </ToolTipService.ToolTip>
                 </SymbolIcon>
             </ToggleButton>
-            <Button Command="{Binding DeleteCommand, ElementName=UserControl}" IsEnabled="{Binding IsDeleteButtonEnabled, ElementName=UserControl}" Visibility="{Binding DeleteButtonVisibility, ElementName=UserControl}" Click="DeleteButton_Click" Style="{StaticResource NoBorderButtonStyle}" Background="{ThemeResource ToggleButtonBackgroundThemeBrush}" Height="{StaticResource MenuSize}" Padding="25,0,25,0">
+            <Button Command="{Binding DeleteCommand, ElementName=UserControl}" IsEnabled="{Binding IsDeleteButtonEnabled, ElementName=UserControl}" Visibility="{Binding DeleteButtonVisibility, ElementName=UserControl}" Click="DeleteButton_Click" Style="{StaticResource MenuButtonStyle}">
                 <SymbolIcon Symbol="Delete">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuDeleteButton" />
@@ -49,7 +60,7 @@
                 </SymbolIcon>
             </Button>
         </StackPanel>
-        <Button Visibility="{Binding MoreButtonVisibility, ElementName=UserControl}" Style="{StaticResource NoBorderButtonStyle}" Background="{ThemeResource ToggleButtonBackgroundThemeBrush}" Height="{StaticResource MenuSize}" Padding="25,0,25,0">
+        <Button Visibility="{Binding MoreButtonVisibility, ElementName=UserControl}" Style="{StaticResource MenuButtonStyle}">
             <SymbolIcon Symbol="More" />
             <Button.Flyout>
                 <MenuFlyout Opening="OverflowFlyout_OnOpening">