UI theme adjustments.

- Removed `BoolToThicknessConverter` class and associated references in `BottomBar.axaml`.
- Adjusted button widths in `BottomBar.axaml` to improve consistency.
- Updated polygon margins in `ToolsMenu.axaml` and `FileMenu.axaml` for better alignment.
- Applied `Path.Xl` style to icons in `ImageInfoView.axaml` for standardized dimensions.
- Added new `Path.Xl` style to `Classes.axaml` for reusable icon scaling.

src/PicView.Avalonia/Converters/BoolToThicknessConverter.cs

@@ -1,24 +0,0 @@
-using System;
-using System.Globalization;
-using Avalonia;
-using Avalonia.Data;
-using Avalonia.Data.Converters;
-
-namespace PicView.Avalonia.Converters;
-
-public class BoolToThicknessConverter : IValueConverter
-{
-    public Thickness TrueThickness { get; set; } = new(0);
-    public Thickness FalseThickness { get; set; } = new(0);
-
-    public object Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (value is bool b)
-            return b ? TrueThickness : FalseThickness;
-
-        return BindingOperations.DoNothing;
-    }
-
-    public object ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-        => BindingOperations.DoNothing;
-}

src/PicView.Avalonia/PicViewTheme/Classes.axaml

@@ -276,4 +276,10 @@
         <Setter Property="Width" Value="12" />
     </Style>
 
+
+    <Style Selector="Path.Xl">
+        <Setter Property="Height" Value="15" />
+        <Setter Property="Width" Value="15" />
+        <Setter Property="Stretch" Value="Fill" />
+    </Style>
 </Styles>

src/PicView.Avalonia/UI/MenuManager.cs

@@ -19,10 +19,10 @@ public static class MenuManager
             return;
         }
 
-        mainView.MainGrid.Children.Add(CreateMenu<FileMenu>(new Thickness(0, 0, 145, 0)));
+        mainView.MainGrid.Children.Add(CreateMenu<FileMenu>(new Thickness(0, 0, 147, 0)));
         mainView.MainGrid.Children.Add(CreateMenu<ImageMenu>(new Thickness(0, 0, 140, 0)));
-        mainView.MainGrid.Children.Add(CreateMenu<SettingsMenu>(new Thickness(0, 0, -99, 0)));
-        mainView.MainGrid.Children.Add(CreateMenu<ToolsMenu>(new Thickness(80, 0, 0, 0)));
+        mainView.MainGrid.Children.Add(CreateMenu<SettingsMenu>(new Thickness(0, 0, -102, 0)));
+        mainView.MainGrid.Children.Add(CreateMenu<ToolsMenu>(new Thickness(95, 0, 0, 0)));
     }
 
     private static T CreateMenu<T>(Thickness margin) where T : Control, new()

src/PicView.Avalonia/Views/Main/ImageInfoView.axaml

@@ -306,7 +306,7 @@
                 Header="{CompiledBinding Translation.Copy.Value,
                                          Mode=OneWay}">
                 <MenuItem.Icon>
-                    <Path Classes="CopyPath" />
+                    <Path Classes="CopyPath Xl" />
                 </MenuItem.Icon>
 
                 <!--  Copy file  -->
@@ -319,7 +319,7 @@
                     IsEnabled="{CompiledBinding PicViewer.FileInfo.Value,
                                                 Converter={x:Static ObjectConverters.IsNotNull}}">
                     <MenuItem.Icon>
-                        <Path Classes="CopyPath" />
+                        <Path Classes="CopyPath Xl" />
                     </MenuItem.Icon>
                 </MenuItem>
 
@@ -331,7 +331,7 @@
                     IsEnabled="{CompiledBinding PicViewer.ImageSource.Value,
                                                 Converter={x:Static ObjectConverters.IsNotNull}}">
                     <MenuItem.Icon>
-                        <Path Classes="CopyPath" />
+                        <Path Classes="CopyPath Xl" />
                     </MenuItem.Icon>
                 </MenuItem>
 
@@ -344,7 +344,7 @@
                     IsEnabled="{CompiledBinding PicViewer.FileInfo.Value,
                                                 Converter={x:Static ObjectConverters.IsNotNull}}">
                     <MenuItem.Icon>
-                        <Path Classes="CopyPath" />
+                        <Path Classes="CopyPath Xl" />
                     </MenuItem.Icon>
                 </MenuItem>
 
@@ -362,7 +362,7 @@
                         </TextBlock>
                     </MenuItem.Header>
                     <MenuItem.Icon>
-                        <Path Classes="CopyPath" />
+                        <Path Classes="CopyPath Xl" />
                     </MenuItem.Icon>
                 </MenuItem>
 
@@ -438,7 +438,7 @@
                                                             FallbackValue=False}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -466,7 +466,7 @@
                                                             FallbackValue=False}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -492,7 +492,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -519,7 +519,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -546,7 +546,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -575,7 +575,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -602,7 +602,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -629,7 +629,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -656,7 +656,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -683,7 +683,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -709,7 +709,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -739,7 +739,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -764,7 +764,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -790,7 +790,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -817,7 +817,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -843,7 +843,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -870,7 +870,7 @@
                                 IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                 ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                               Mode=OneWay}">
-                                <Path Classes="CopyPath" />
+                                <Path Classes="CopyPath Xl" />
                             </customControls:CopyButton>
                         </StackPanel>
 
@@ -926,7 +926,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -951,7 +951,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -976,7 +976,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1001,7 +1001,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1026,7 +1026,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1051,7 +1051,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1076,7 +1076,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
                         </WrapPanel>
@@ -1131,7 +1131,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1158,7 +1158,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1185,7 +1185,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
 
                             </StackPanel>
@@ -1268,7 +1268,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1298,7 +1298,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
 
                             </StackPanel>
@@ -1329,7 +1329,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -1356,7 +1356,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
                         </WrapPanel>
@@ -1409,7 +1409,7 @@
                                         IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                         ToolTip.Tip="{CompiledBinding Translation.Copy,
                                                                       Mode=OneWay}">
-                                        <Path Classes="CopyPath" />
+                                        <Path Classes="CopyPath Xl" />
                                     </customControls:CopyButton>
                                 </StackPanel>
 
@@ -1434,7 +1434,7 @@
                                         IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                         ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                       Mode=OneWay}">
-                                        <Path Classes="CopyPath" />
+                                        <Path Classes="CopyPath Xl" />
                                     </customControls:CopyButton>
                                 </StackPanel>
                             </StackPanel>
@@ -1462,7 +1462,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1487,7 +1487,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1516,7 +1516,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1541,7 +1541,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1570,7 +1570,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1594,7 +1594,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1623,7 +1623,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1648,7 +1648,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1677,7 +1677,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1702,7 +1702,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1731,7 +1731,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1756,7 +1756,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1785,7 +1785,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1809,7 +1809,7 @@
                                                                        Mode=OneWay}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1838,7 +1838,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1863,7 +1863,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1892,7 +1892,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1917,7 +1917,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -1946,7 +1946,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
 
@@ -1977,7 +1977,7 @@
                                             IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                             ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                           Mode=OneWay}">
-                                            <Path Classes="CopyPath" />
+                                            <Path Classes="CopyPath Xl" />
                                         </customControls:CopyButton>
                                     </StackPanel>
                                 </StackPanel>
@@ -2004,7 +2004,7 @@
                                     IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                     ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                   Mode=OneWay}">
-                                    <Path Classes="CopyPath" />
+                                    <Path Classes="CopyPath Xl" />
                                 </customControls:CopyButton>
                             </StackPanel>
 
@@ -2030,7 +2030,7 @@
                                         IsVisible="{CompiledBinding InfoWindow.IsCopyButtonEnabled.Value}"
                                         ToolTip.Tip="{CompiledBinding Translation.Copy.Value,
                                                                       Mode=OneWay}">
-                                        <Path Classes="CopyPath" />
+                                        <Path Classes="CopyPath Xl" />
                                     </customControls:CopyButton>
                                 </StackPanel>
                             </StackPanel>

src/PicView.Avalonia/Views/UC/BottomBar.axaml

@@ -8,13 +8,11 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:customControls="clr-namespace:PicView.Avalonia.CustomControls"
     xmlns:viewModels="clr-namespace:PicView.Avalonia.ViewModels"
-    xmlns:converters="clr-namespace:PicView.Avalonia.Converters;assembly=PicView.Avalonia"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <UserControl.Resources>
         <SolidColorBrush Color="{DynamicResource MainTextColor}" x:Key="ImageMenuBrush" />
         <SolidColorBrush Color="{DynamicResource MainTextColor}" x:Key="ToolsMenuBrush" />
-        <converters:BoolToThicknessConverter x:Key="AllowResizeMarginConverter" TrueThickness="0,0,10,0" FalseThickness="0" />
     </UserControl.Resources>
 
     <UserControl.ContextMenu>
@@ -207,7 +205,7 @@
                                  Mode=OneWay}"
         x:Name="MainBottomBorder">
         <Panel>
-            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Margin="{CompiledBinding MainWindow.CanResize.Value, Mode=OneWay, Converter={StaticResource AllowResizeMarginConverter}}">
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
 
                 <customControls:IconButton
                     Background="{DynamicResource SecondaryButtonBackgroundColor}"
@@ -221,7 +219,7 @@
                     IconHeight="17"
                     IconWidth="20"
                     IsTabStop="False"
-                    Width="35"
+                    Width="38"
                     x:Name="FileMenuButton" />
 
                 <Button
@@ -233,7 +231,7 @@
                     Foreground="{StaticResource ImageMenuBrush}"
                     Height="25"
                     IsTabStop="False"
-                    Width="35"
+                    Width="38"
                     x:Name="ImageMenuButton">
                     <Canvas
                         Height="25"
@@ -278,7 +276,7 @@
                     IsEnabled="{CompiledBinding PicViewer.ImageSource.Value,
                                                 Converter={x:Static ObjectConverters.IsNotNull}}"
                     IsTabStop="False"
-                    Width="35"
+                    Width="38"
                     x:Name="ZoomOutButton" />
 
                 <customControls:IconButton
@@ -294,7 +292,7 @@
                     IsEnabled="{CompiledBinding PicViewer.ImageSource.Value,
                                                 Converter={x:Static ObjectConverters.IsNotNull}}"
                     IsTabStop="False"
-                    Width="35"
+                    Width="38"
                     x:Name="ZoomInButton" />
 
                 <customControls:IconButton
@@ -349,7 +347,7 @@
                     Margin="0"
                     ToolTip.Tip="{CompiledBinding Translation.RotateRight.Value,
                                                   Mode=OneWay}"
-                    Width="35"
+                    Width="38"
                     x:Name="RotateRightButton" />
 
                 <customControls:IconButton
@@ -370,7 +368,7 @@
                     Margin="0"
                     ToolTip.Tip="{CompiledBinding Translation.IsFlipped.Value,
                                                   Mode=OneWay}"
-                    Width="35"
+                    Width="38"
                     x:Name="FlipButton">
                     <Button.RenderTransform>
                         <ScaleTransform ScaleX="{CompiledBinding PicViewer.ScaleX.Value}" />
@@ -386,7 +384,7 @@
                     Foreground="{StaticResource ToolsMenuBrush}"
                     Height="{CompiledBinding MainWindow.BottombarHeight.Value}"
                     IsTabStop="False"
-                    Width="35"
+                    Width="38"
                     x:Name="ToolsMenuButton">
                     <Image Height="19" Width="19">
                         <Image.Resources>
@@ -430,7 +428,8 @@
                     IconHeight="16"
                     IconWidth="16"
                     IsTabStop="False"
-                    Width="35"
+                    Width="38"
+                    ZIndex="1"
                     x:Name="SettingsMenuButton" />
 
             </StackPanel>

src/PicView.Avalonia/Views/UC/Menus/FileMenu.axaml

@@ -264,7 +264,7 @@
         </Border>
         <Polygon
             Fill="{DynamicResource MenuBackgroundColor}"
-            Margin="10,-1,0,0"
+            Margin="7,-1,0,0"
             Points="0,0 15,30, 30,0"
             Stroke="{DynamicResource MainBorderColor}"
             StrokeThickness="1"

src/PicView.Avalonia/Views/UC/Menus/SettingsMenu.axaml

@@ -238,7 +238,7 @@
         </Border>
         <Polygon
             Fill="{DynamicResource MenuBackgroundColor}"
-            Margin="313,-1,0,0"
+            Margin="325,-1,0,0"
             Points="0,0 15,30, 30,0"
             Stroke="{DynamicResource MainBorderColor}"
             StrokeThickness="1" />

src/PicView.Avalonia/Views/UC/Menus/ToolsMenu.axaml

@@ -222,7 +222,7 @@
         </Border>
         <Polygon
             Fill="{DynamicResource MenuBackgroundColor}"
-            Margin="285,-1,0,0"
+            Margin="290,-1,0,0"
             Points="0,0 15,30, 30,0"
             Stroke="{DynamicResource MainBorderColor}"
             StrokeThickness="1" />