Icons work again

Colors work again

ModernKeePass/Views/UserControls/SymbolPickerUserControl.xaml

@@ -5,12 +5,18 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
-    <ComboBox x:Name="ComboBox" ItemsSource="{Binding Symbols, ElementName=UserControl}" SelectedItem="{Binding SelectedSymbol, ElementName=UserControl, Mode=TwoWay}" Loaded="ComboBox_OnLoaded" ItemContainerStyle="{StaticResource MainColorComboBoxItem}" Style="{StaticResource MainColorComboBox}">
+    <ComboBox 
+        x:Name="ComboBox" 
+        ItemsSource="{Binding Symbols, ElementName=UserControl}" 
+        SelectedItem="{Binding SelectedSymbol, ElementName=UserControl, Mode=TwoWay}" 
+        Loaded="ComboBox_OnLoaded" 
+        ItemContainerStyle="{StaticResource MainColorComboBoxItem}" 
+        Style="{StaticResource MainColorComboBox}">
         <ComboBox.ItemTemplate>
             <DataTemplate>
-                <StackPanel Orientation="Horizontal" Margin="0,0,10,0">
+                <Border>
                     <SymbolIcon Symbol="{Binding}" />
-                </StackPanel>
+                </Border>
             </DataTemplate>
         </ComboBox.ItemTemplate>
     </ComboBox>

ModernKeePass/Views/UserControls/TopMenuUserControl.xaml

@@ -43,7 +43,7 @@
         </VisualStateManager.VisualStateGroups>
         <StackPanel x:Name="OverflowButtons" Orientation="Horizontal">
             <Button Command="{Binding MoveCommand, ElementName=UserControl}" IsEnabled="{Binding IsMoveButtonEnabled, ElementName=UserControl}" Click="MoveButton_Click" Style="{StaticResource MenuButtonStyle}">
-                <SymbolIcon Symbol="Undo">
+                <SymbolIcon Symbol="MoveToFolder">
                     <ToolTipService.ToolTip>
                         <ToolTip x:Uid="TopMenuMoveButton" />
                     </ToolTipService.ToolTip>