More icons

src/PixiEditor.AvaloniaUI/ViewModels/Dock/SwatchesDockViewModel.cs

@@ -24,6 +24,6 @@ internal class SwatchesDockViewModel : DockableViewModel
     public SwatchesDockViewModel(DocumentManagerViewModel documentManagerViewModel)
     {
         DocumentManagerSubViewModel = documentManagerViewModel;
-        TabCustomizationSettings.Icon = PixiPerfectIcons.ToIcon(PixiPerfectIcons.Grid);
+        TabCustomizationSettings.Icon = PixiPerfectIcons.ToIcon(PixiPerfectIcons.Swatches);
     }
 }

src/PixiEditor.AvaloniaUI/ViewModels/SubViewModels/LayersViewModel.cs

@@ -341,7 +341,8 @@ internal class LayersViewModel : SubViewModel<ViewModelMain>
     public bool ReferenceLayerDoesntExist() => 
         Owner.DocumentManagerSubViewModel.ActiveDocument is not null && Owner.DocumentManagerSubViewModel.ActiveDocument.ReferenceLayerViewModel.ReferenceBitmap is null;
 
-    [Command.Basic("PixiEditor.Layer.ImportReferenceLayer", "ADD_REFERENCE_LAYER", "ADD_REFERENCE_LAYER", CanExecute = "PixiEditor.Layer.ReferenceLayerDoesntExist", Icon = "Add-reference.png")]
+    [Command.Basic("PixiEditor.Layer.ImportReferenceLayer", "ADD_REFERENCE_LAYER", "ADD_REFERENCE_LAYER", CanExecute = "PixiEditor.Layer.ReferenceLayerDoesntExist",
+        Icon = PixiPerfectIcons.AddReference)]
     public async Task ImportReferenceLayer()
     {
         var doc = Owner.DocumentManagerSubViewModel.ActiveDocument;

src/PixiEditor.AvaloniaUI/ViewModels/Tools/Tools/PenToolViewModel.cs

@@ -38,7 +38,7 @@ namespace PixiEditor.AvaloniaUI.ViewModels.Tools.Tools
         [Settings.Bool("PIXEL_PERFECT_SETTING", Notify = nameof(PixelPerfectChanged))]
         public bool PixelPerfectEnabled => GetValue<bool>();
 
-        public override string Icon => PixiPerfectIcons.Edit;
+        public override string Icon => PixiPerfectIcons.Pen;
 
         public override void ModifierKeyChanged(bool ctrlIsDown, bool shiftIsDown, bool altIsDown)
         {

src/PixiEditor.AvaloniaUI/Views/Dialogs/AboutPopup.axaml

@@ -30,7 +30,7 @@
                 <Label  Margin="10 0 0 0" FontSize="14">
                     <TextBlock ui1:Hyperlink.Url="https://github.com/flabbet" >
                         <Run Text="Krzysztof Krysiński (flabbet)"/>
-                        <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                        <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
                     </TextBlock>
                 </Label>
             </StackPanel>
@@ -43,7 +43,7 @@
                 <Label Margin="10 0 0 0" FontSize="14">
                     <TextBlock ui1:Hyperlink.Url="https://github.com/equbuxu" >
                         <Run Text="Egor Mozgovoy (Equbuxu)"/>
-                        <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                        <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
                     </TextBlock>
                 </Label>
             </StackPanel>
@@ -56,7 +56,7 @@
                 <Label Margin="10 0 0 0" FontSize="14">
                     <TextBlock ui1:Hyperlink.Url="https://github.com/CPKreuz" >
                         <Run Text="Philip Kreuz (cpk)"/>
-                        <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                        <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
                     </TextBlock>
                 </Label>
             </StackPanel>
@@ -64,7 +64,7 @@
             <Label Margin="20 10 0 0" FontSize="14">
                 <TextBlock ui1:Hyperlink.Url="https://github.com/PixiEditor/PixiEditor/graphs/contributors">
                     <Run ui:Translator.Key="OTHER_AWESOME_CONTRIBUTORS" />
-                    <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                    <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
                 </TextBlock>
             </Label>
 
@@ -73,21 +73,21 @@
             <Label Margin="20 10 0 0" FontSize="14">
                 <TextBlock ui1:Hyperlink.Url="LICENSE">
                     <Run ui:Translator.Key="LICENSE"/>
-                    <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                    <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
                 </TextBlock>
             </Label>
 
             <Label Margin="20 10 0 0" FontSize="14">
                 <TextBlock ui1:Hyperlink.Url="THIRD_PARTY_LICENSES.txt">
                     <Run ui:Translator.Key="THIRD_PARTY_LICENSES"/>
-                    <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                    <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
                 </TextBlock>
             </Label>
 
             <Label Margin="20 10 0 0" FontSize="14">
                 <TextBlock ui1:Hyperlink.Url="https://pixieditor.net/docs/introduction">
                     <Run ui:Translator.Key="DOCUMENTATION" />
-                    <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                    <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
                 </TextBlock>
             </Label>
 

src/PixiEditor.AvaloniaUI/Views/Dialogs/ShortcutsPopup.axaml

@@ -38,7 +38,7 @@
                         <system:Int32>2</system:Int32>
                     </ui1:Hyperlink.CommandParameter>
                     <Run ui:Translator.Key="EDIT"/>
-                    <Run Text="" FontFamily="{DynamicResource Feather}"/>
+                    <Run Text="{DynamicResource icon-link}" Classes="pixi-icon"/>
             </TextBlock>
             <ScrollViewer Grid.Row="3" VerticalScrollBarVisibility="Auto">
                 <DockPanel HorizontalAlignment="Center" Margin="2">

src/PixiEditor.AvaloniaUI/Views/Layers/ReferenceLayer.axaml

@@ -39,11 +39,11 @@
                         <Grid Cursor="Hand" IsVisible="{Binding ElementName=visibilityCheckbox, Path=!IsChecked}"
                               Background="Transparent">
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" DockPanel.Dock="Left">
-                                <Image Margin="5 0 5 0" Width="20" Source="/Images/Add-reference.png"
+                                <TextBlock Margin="5 0 5 0" VerticalAlignment="Center" FontSize="24" Text="{DynamicResource icon-add-reference}" Classes="pixi-icon"
                                        IsVisible="{Binding Document.ReferenceLayerViewModel.ReferenceBitmap, ElementName=uc, Converter={converters:NullToVisibilityConverter}}" />
 
                                 <TextBlock IsEnabled="{Binding ElementName=uc, Path=IsEnabled}"
-                                           Margin="0 0 5 0" Foreground="White"
+                                           Margin="0 0 5 0" Foreground="{DynamicResource ThemeForegroundBrush}"
                                            FontSize="15" VerticalAlignment="Center"
                                            ui:Translator.Key="ADD_REFERENCE_LAYER" />
                             </StackPanel>

src/PixiEditor.AvaloniaUI/Views/NewsFeed/NewsItem.axaml

@@ -13,36 +13,35 @@
         <StackPanel Orientation="Vertical">
             <Grid>
                 <Border Name="Mask" CornerRadius="8 8 0 0" ClipToBounds="True">
-                <StackPanel>
-                    <Image Cursor="Hand" Margin="-1" asyncImageLoader:ImageLoader.Source="{Binding ElementName=newsItem, Path=News.CoverImageUrl}"
-                           PointerPressed="CoverImageClicked" Name="coverImage"/>
-                </StackPanel>
+                    <StackPanel>
+                        <Image Cursor="Hand" Margin="-1"
+                               asyncImageLoader:ImageLoader.Source="{Binding ElementName=newsItem, Path=News.CoverImageUrl}"
+                               PointerPressed="CoverImageClicked" Name="coverImage" />
+                    </StackPanel>
                 </Border>
             </Grid>
             <StackPanel Margin="8 0" Orientation="Horizontal">
                 <Image Margin="0 0 5 0" Width="25"
-                       Source="{Binding ElementName=newsItem, Path=News.ResolvedIconUrl, Converter={converters:ImagePathToBitmapConverter}}"/>
+                       Source="{Binding ElementName=newsItem, Path=News.ResolvedIconUrl, Converter={converters:ImagePathToBitmapConverter}}" />
                 <Label VerticalAlignment="Center" HorizontalAlignment="Center">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock Width="200" TextTrimming="CharacterEllipsis" MaxHeight="50"
-                                   ui:Hyperlink.Url="{Binding ElementName=newsItem, Path=News.Url}"
-                                   ToolTip.Tip="{Binding ElementName=newsItem, Path=News.Title}"
-                                   TextWrapping="Wrap"
-                                   Text="{Binding ElementName=newsItem, Path=News.Title}"/>
-                        <TextBlock Text="" FontFamily="{DynamicResource Feather}"/>
-                    </StackPanel>
+                    <TextBlock Width="200" TextTrimming="CharacterEllipsis" MaxHeight="50"
+                               ui:Hyperlink.Url="{Binding ElementName=newsItem, Path=News.Url}"
+                               TextWrapping="Wrap">
+                        <Run Text="{Binding ElementName=newsItem, Path=News.Title}" />
+                        <Run Text="{DynamicResource icon-link}" Classes="pixi-icon" />
+                    </TextBlock>
                 </Label>
             </StackPanel>
             <Grid>
                 <Border IsVisible="{Binding ElementName=newsItem, Path=News.IsNew}"
                         Margin="2.5 2.5" Background="{DynamicResource ThemeAccentBrush}" HorizontalAlignment="Left"
                         Padding="5 2.5" CornerRadius="5">
-                    <TextBlock Text="New!" Foreground="White" FontSize="12" FontStyle="Italic"/>
+                    <TextBlock Text="New!" Foreground="White" FontSize="12" FontStyle="Italic" />
                 </Border>
                 <TextBlock Margin="8 5" HorizontalAlignment="Right" FontSize="12" Foreground="LightGray"
-                           Text="{Binding ElementName=newsItem, Path=News.Date, StringFormat=d}"/>
+                           Text="{Binding ElementName=newsItem, Path=News.Date, StringFormat=d}" />
                 <!--TODO: Converter culture was in above date-->
             </Grid>
         </StackPanel>
     </Border>
-</UserControl>
+</UserControl>

src/PixiEditor.AvaloniaUI/Views/Palettes/ColorReplacer.axaml

@@ -9,6 +9,13 @@
              xmlns:ui1="clr-namespace:PixiEditor.AvaloniaUI.Helpers.UI"
              xmlns:controls="clr-namespace:PixiEditor.UI.Common.Controls;assembly=PixiEditor.UI.Common"
              Name="uc">
+    <UserControl.Styles>
+        <Style Selector="TextBlock#arrow[FlowDirection=RightToLeft]">
+            <Setter Property="RenderTransform">
+                <RotateTransform Angle="180"/>
+            </Setter>
+        </Style>
+    </UserControl.Styles>
     <Border BorderBrush="{DynamicResource ThemeBorderMidColor}"
             Background="{DynamicResource ThemeBackgroundColor}"
             BorderThickness="0 2 0 0" MinWidth="60" Focusable="True">
@@ -31,7 +38,8 @@
                                                ui:Translator.TooltipKey="REPLACER_TOOLTIP"
                                                ui1:DragDropEvents.Drop="PaletteColorControl_OnDrop"
                                                DragDrop.AllowDrop="True" />
-                    <Image Source="/Images/Arrow-right.png" Height="20" Width="20" Margin="10 0" ui:Translator.UseLanguageFlowDirection="True"/>
+                    <TextBlock Name="arrow" VerticalAlignment="Center" Text="{DynamicResource icon-arrow-right}" Classes="pixi-icon" 
+                               FontSize="24" Margin="10 0" ui:Translator.UseLanguageFlowDirection="True"/>
                     <colorPicker:PortableColorPicker
                         UseHintColor="True"
                         SelectedColor="{Binding ElementName=uc, Path=NewColor, Mode=TwoWay}"
@@ -41,11 +49,10 @@
                         ui:Translator.TooltipKey="CLICK_TO_CHOOSE_COLOR"
                         ShowAlpha="False"/>
                     <Button Click="ReplaceButton_OnClick" ui:Translator.TooltipKey="REPLACE_COLOR"
-                            Classes="ToolButtonStyle" Cursor="Hand" Height="20" Width="20">
-                        <Button.Background>
-                            <ImageBrush Source="/Images/Replace.png"/>
-                        </Button.Background>
-                    </Button>
+                            Classes="pixi-icon" 
+                            Content="{DynamicResource icon-swap}"
+                            Cursor="Hand" 
+                            Height="24" Width="24"/>
                 </StackPanel>
                 </controls:Shelf>
             </Grid>

src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml

@@ -103,6 +103,9 @@
             <system:String x:Key="icon-y-symmetry">&#xE960;</system:String>
             <system:String x:Key="icon-zoom-in">&#xE961;</system:String>
             <system:String x:Key="icon-zoom-out">&#xE962;</system:String>
+            <system:String x:Key="icon-pen">&#xE971;</system:String>
+            <system:String x:Key="icon-link">&#xE96B;</system:String>
+            
             <system:String x:Key="icon-copy-add">&#x25a1;</system:String>
             <system:String x:Key="icon-paste-reference-layer">&#x25a1;</system:String>
             <system:String x:Key="icon-paste-as-new-layer">&#x25a1;</system:String>
@@ -113,6 +116,10 @@
         <Setter Property="FontFamily" Value="{DynamicResource PixiPerfectIcons}"/>
     </Style>
     
+    <Style Selector="Run.pixi-icon">
+        <Setter Property="FontFamily" Value="{DynamicResource PixiPerfectIcons}"/>
+    </Style>
+    
     <Style Selector="Button.pixi-icon">
         <Setter Property="FontFamily" Value="{DynamicResource PixiPerfectIcons}"/>
         <Setter Property="Background" Value="Transparent"/>

src/PixiEditor.UI.Common/Fonts/PixiPerfectIcons.axaml.cs

@@ -59,7 +59,8 @@ public static class PixiPerfectIcons
     public const string FolderPlus = "\ue92c";
     public const string Folder = "\ue92d";
     public const string Globe = "\ue92e";
-    public const string Grid = "\ue92f";
+    public const string Swatches = "\ue92f";
+    public const string Grid = "\uE941";
     public const string Home = "\ue930";
     public const string RotateImageMinus90 = "\ue931";
     public const string Image = "\ue932";
@@ -113,6 +114,7 @@ public static class PixiPerfectIcons
     public const string PasteReferenceLayer = "\u25a1"; // TODO: Create a paste reference layer icon
     public const string PasteAsNewLayer = "\u25a1"; // TODO: Create a paste as new layer icon
     public const string CopyAdd = "\u25a1"; // TODO: Create a copy add icon
+    public static string Pen => "\uE971";
 
     public static IImage ToIcon(string unicode, double size = 18)
     {

src/PixiEditor.UI.Common/Styles/TextStyles.axaml

@@ -32,7 +32,6 @@
 
     <Style Selector="TextBlock.hyperlink:pointerover">
         <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundBrush}"/>
-        <Setter Property="TextDecorations" Value="Underline"/>
         <Setter Property="Cursor" Value="Hand"/>
     </Style>
 </Styles>