diff --git a/ModernKeePass/App.xaml.cs b/ModernKeePass/App.xaml.cs
index 03a88dd..f5c009e 100644
--- a/ModernKeePass/App.xaml.cs
+++ b/ModernKeePass/App.xaml.cs
@@ -99,7 +99,7 @@ namespace ModernKeePass
 #if DEBUG
             if (System.Diagnostics.Debugger.IsAttached)
             {
-                DebugSettings.EnableFrameRateCounter = true;
+                //DebugSettings.EnableFrameRateCounter = true;
             }
 #endif
 
diff --git a/ModernKeePass/Converters/IntToSymbolConverter.cs b/ModernKeePass/Converters/IntToSymbolConverter.cs
index 4abace5..a9e1243 100644
--- a/ModernKeePass/Converters/IntToSymbolConverter.cs
+++ b/ModernKeePass/Converters/IntToSymbolConverter.cs
@@ -75,6 +75,7 @@ namespace ModernKeePass.Converters
         public object ConvertBack(object value, Type targetType, object parameter, string language)
         {
             var symbol = (Symbol) value;
+            var defaultIcon = (int?) parameter ?? -1;
             switch (symbol)
             {
                 case Symbol.Delete: return (int)PwIcon.TrashBin;
@@ -123,7 +124,7 @@ namespace ModernKeePass.Converters
                 case Symbol.ZeroBars: return (int) PwIcon.Energy;
                 case Symbol.FourBars: return (int) PwIcon.EnergyCareful;
                 case Symbol.Scan: return (int) PwIcon.Scanner;
-                default: return (int) PwIcon.Key;
+                default: return defaultIcon;
             }
         }
     }
diff --git a/ModernKeePass/Views/EntryDetailPage.xaml b/ModernKeePass/Views/EntryDetailPage.xaml
index 3a8144e..8438251 100644
--- a/ModernKeePass/Views/EntryDetailPage.xaml
+++ b/ModernKeePass/Views/EntryDetailPage.xaml
@@ -19,7 +19,6 @@
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter" />
         <converters:ProgressBarLegalValuesConverter x:Key="ProgressBarLegalValuesConverter" />
         <converters:DoubleToSolidColorBrushConverter x:Key="DoubleToForegroungBrushComplexityConverter" />
-        <converters:NullToBooleanConverter x:Key="NullToBooleanConverter" />
         <converters:ColorToBrushConverter x:Key="ColorToBrushConverter" />
         <converters:IntToSymbolConverter x:Key="IntToSymbolConverter" />
         <Style TargetType="PasswordBox" x:Name="PasswordBoxWithButtonStyle">
@@ -499,7 +498,7 @@
                     <RowDefinition Height="20" />
                 </Grid.RowDefinitions>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" />
+                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=0, Mode=TwoWay}" />
                 </Viewbox>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
                     <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Width="80" Height="40"  />
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index 2b0982b..29e4183 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -105,7 +105,7 @@
                                         </Grid.ColumnDefinitions>
                                         <Border Grid.Column="0" Background="{Binding BackgroundColor, ConverterParameter={StaticResource MainColor}, Converter={StaticResource ColorToBrushConverter}}">
                                             <Viewbox MaxHeight="50" Width="100">
-                                                <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Foreground="{StaticResource TextColor}" />
+                                                <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=0}" Foreground="{StaticResource TextColor}" />
                                             </Viewbox>
                                         </Border>
                                         <StackPanel Grid.Column="1" VerticalAlignment="Top" Margin="10,10,0,0" >
@@ -207,7 +207,7 @@
                     <RowDefinition Height="20" />
                 </Grid.RowDefinitions>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}">
-                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, Mode=TwoWay}" />
+                    <userControls:SymbolPickerUserControl Width="80" Height="40" SelectedSymbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=48, Mode=TwoWay}" />
                 </Viewbox>
                 <Viewbox MaxHeight="30" Width="50" Grid.Column="0" Grid.Row="0" Visibility="{Binding IsEditMode, Converter={StaticResource InverseBooleanToVisibilityConverter}}">
                     <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Width="80" Height="40"  />
diff --git a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
index 46fb1e5..bc61378 100644
--- a/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
+++ b/ModernKeePass/Views/UserControls/HamburgerMenuUserControl.xaml
@@ -26,7 +26,7 @@
             <x:Double x:Key="HamburgerMenuSize">300</x:Double>
             <DataTemplate x:Name="IsSpecial">
                 <StackPanel Orientation="Horizontal">
-                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Margin="7,15,0,15">
+                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=48}" Margin="7,15,0,15">
                         <ToolTipService.ToolTip>
                             <ToolTip Content="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" />
                         </ToolTipService.ToolTip>
@@ -36,7 +36,7 @@
             </DataTemplate>
             <DataTemplate x:Name="IsNormal">
                 <StackPanel Orientation="Horizontal">
-                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}}" Margin="7,15,0,15">
+                    <SymbolIcon Symbol="{Binding IconId, Converter={StaticResource IntToSymbolConverter}, ConverterParameter=48}" Margin="7,15,0,15">
                         <ToolTipService.ToolTip>
                             <ToolTip Content="{Binding Path={Binding DisplayMemberPath, ElementName=UserControl}}" />
                         </ToolTipService.ToolTip>
diff --git a/ModernKeePass/Views/UserControls/SymbolPickerUserControl.xaml.cs b/ModernKeePass/Views/UserControls/SymbolPickerUserControl.xaml.cs
index a2af327..9ea89b1 100644
--- a/ModernKeePass/Views/UserControls/SymbolPickerUserControl.xaml.cs
+++ b/ModernKeePass/Views/UserControls/SymbolPickerUserControl.xaml.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using ModernKeePass.Converters;
 
 // The User Control item template is documented at http://go.microsoft.com/fwlink/?LinkId=234236
 
@@ -9,7 +11,7 @@ namespace ModernKeePass.Views.UserControls
 {
     public sealed partial class SymbolPickerUserControl
     {
-        public Symbol[] Symbols { get; }
+        public IEnumerable<Symbol> Symbols { get; }
 
         public Symbol SelectedSymbol
         {
@@ -26,8 +28,8 @@ namespace ModernKeePass.Views.UserControls
         public SymbolPickerUserControl()
         {
             InitializeComponent();
-
-            Symbols = (Symbol[])Enum.GetValues(typeof(Symbol));
+            var converter = new IntToSymbolConverter();
+            Symbols = Enum.GetValues(typeof(Symbol)).Cast<Symbol>().Where(s => (int)converter.ConvertBack(s, null, null, string.Empty) != -1);
         }
 
         private void ComboBox_OnLoaded(object sender, RoutedEventArgs e)