diff --git a/ModernKeePass/Converters/BooleanToFontStyleConverter.cs b/ModernKeePass/Converters/BooleanToFontStyleConverter.cs
deleted file mode 100644
index e767a33..0000000
--- a/ModernKeePass/Converters/BooleanToFontStyleConverter.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using Windows.UI.Text;
-using Windows.UI.Xaml.Data;
-
-namespace ModernKeePass.Converters
-{
-    public class BooleanToFontStyleConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            var boolean = value is bool ? (bool)value : false;
-            return boolean ? FontStyle.Italic : FontStyle.Normal;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/ModernKeePass/ModernKeePassApp.csproj b/ModernKeePass/ModernKeePassApp.csproj
index 59ae845..5d47f5f 100644
--- a/ModernKeePass/ModernKeePassApp.csproj
+++ b/ModernKeePass/ModernKeePassApp.csproj
@@ -117,6 +117,7 @@
     <Compile Include="Interfaces\IRecent.cs" />
     <Compile Include="Interfaces\IRecentItem.cs" />
     <Compile Include="Interfaces\IResource.cs" />
+    <Compile Include="TemplateSelectors\SelectableDataTemplateSelector.cs" />
     <Compile Include="ViewModels\DonateVm.cs" />
     <Compile Include="Views\MainPageFrames\DonatePage.xaml.cs">
       <DependentUpon>DonatePage.xaml</DependentUpon>
@@ -165,7 +166,6 @@
     <Compile Include="Converters\ColorToBrushConverter.cs" />
     <Compile Include="Converters\DoubleToSolidColorBrushConverter.cs" />
     <Compile Include="Converters\InverseBooleanToVisibilityConverter.cs" />
-    <Compile Include="Converters\BooleanToFontStyleConverter.cs" />
     <Compile Include="Converters\PluralizationConverter.cs" />
     <Compile Include="Converters\ProgressBarLegalValuesConverter.cs" />
     <Compile Include="Converters\TextToWidthConverter.cs" />
diff --git a/ModernKeePass/Package.appxmanifest b/ModernKeePass/Package.appxmanifest
index 87d3c00..c5e4222 100644
--- a/ModernKeePass/Package.appxmanifest
+++ b/ModernKeePass/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest" xmlns:m2="http://schemas.microsoft.com/appx/2013/manifest">
-  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.12.0.31" />
+  <Identity Name="wismna.ModernKeePass" Publisher="CN=0719A91A-C322-4EE0-A257-E60733EECF06" Version="1.12.0.32" />
   <Properties>
     <DisplayName>ModernKeePass</DisplayName>
     <PublisherDisplayName>wismna</PublisherDisplayName>
diff --git a/ModernKeePass/Services/DatabaseService.cs b/ModernKeePass/Services/DatabaseService.cs
index 68341d7..5689dcc 100644
--- a/ModernKeePass/Services/DatabaseService.cs
+++ b/ModernKeePass/Services/DatabaseService.cs
@@ -27,7 +27,6 @@ namespace ModernKeePass.Services
         }
         private readonly PwDatabase _pwDatabase = new PwDatabase();
         private readonly ISettings _settings;
-        private readonly IResource _resource;
         private StorageFile _databaseFile;
         private GroupVm _recycleBin;
 
diff --git a/ModernKeePass/TemplateSelectors/SelectableDataTemplateSelector.cs b/ModernKeePass/TemplateSelectors/SelectableDataTemplateSelector.cs
new file mode 100644
index 0000000..60c90ff
--- /dev/null
+++ b/ModernKeePass/TemplateSelectors/SelectableDataTemplateSelector.cs
@@ -0,0 +1,18 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using ModernKeePass.Interfaces;
+
+namespace ModernKeePass.TemplateSelectors
+{
+    public class SelectableDataTemplateSelector: DataTemplateSelector
+    {
+        public DataTemplate TrueItem { get; set; }
+        public DataTemplate FalseItem { get; set; }
+        
+        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+        {
+            var isSelectableItem = item as ISelectableModel;
+            return isSelectableItem != null && isSelectableItem.IsSelected ? TrueItem : FalseItem;
+        }
+    }
+}
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index 6326d67..71d775f 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -8,7 +8,6 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity" 
     xmlns:core="using:Microsoft.Xaml.Interactions.Core"
     xmlns:actions="using:ModernKeePass.Actions"
-    xmlns:controls="using:ModernKeePass.Controls"
     xmlns:templateSelectors="using:ModernKeePass.TemplateSelectors"
     x:Name="PageRoot"
     x:Class="ModernKeePass.Views.GroupDetailPage"
@@ -16,7 +15,6 @@
     SizeChanged="GroupDetailPage_OnSizeChanged">
     <Page.Resources>
         <converters:ColorToBrushConverter x:Key="ColorToBrushConverter"/>
-        <converters:BooleanToFontStyleConverter x:Key="BooleanToFontStyleConverter"/>
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
         <converters:InverseBooleanToVisibilityConverter x:Key="InverseBooleanToVisibilityConverter"/>
         <converters:NullToBooleanConverter x:Key="NullToBooleanConverter"/>
@@ -126,18 +124,31 @@
                 RequestedTheme="Dark"
                 Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
                 Foreground="{ThemeResource DefaultTextForegroundThemeBrush}">
-                <ListView.ItemTemplate>
-                    <DataTemplate x:Name="GroupOtherItem">
+                <ListView.Resources>
+                    <DataTemplate x:Name="IsRecycleBin">
                         <StackPanel Orientation="Horizontal">
                             <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0">
                                 <ToolTipService.ToolTip>
                                     <ToolTip Content="{Binding Name}" />
                                 </ToolTipService.ToolTip>
                              </SymbolIcon>
-                            <TextBlock Text="{Binding Name}" x:Name="GroupTextBlock" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" FontStyle="{Binding IsSelected, Converter={StaticResource BooleanToFontStyleConverter}}" />
+                            <TextBlock Text="{Binding Name}" x:Name="GroupTextBlock" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" FontStyle="Italic" />
                         </StackPanel>
                     </DataTemplate>
-                </ListView.ItemTemplate>
+                    <DataTemplate x:Name="IsNotRecycleBin">
+                        <StackPanel Orientation="Horizontal">
+                            <SymbolIcon Symbol="{Binding IconSymbol}" Margin="8,0,0,0">
+                                <ToolTipService.ToolTip>
+                                    <ToolTip Content="{Binding Name}" />
+                                </ToolTipService.ToolTip>
+                             </SymbolIcon>
+                            <TextBlock Text="{Binding Name}" x:Name="GroupTextBlock" TextWrapping="NoWrap" VerticalAlignment="Center" Margin="30,0,20,0" />
+                        </StackPanel>
+                    </DataTemplate>
+                </ListView.Resources>
+                <ListView.ItemTemplateSelector>
+                    <templateSelectors:SelectableDataTemplateSelector FalseItem="{StaticResource IsNotRecycleBin}" TrueItem="{StaticResource IsRecycleBin}" />
+                </ListView.ItemTemplateSelector>
                 <ListView.ItemsSource>
                     <Binding Source="{StaticResource GroupsViewSource}"/>
                 </ListView.ItemsSource>
@@ -162,7 +173,7 @@
                                     </core:EventTriggerBehavior>
                                 </interactivity:Interaction.Behaviors>
                             </ToggleButton>
-                            <Button Padding="0" Height="50" Margin="0" Style="{StaticResource NoBorderButtonStyle}" Background="Transparent" Foreground="White" BorderThickness="0" Click="CreateGroup_ButtonClick">
+                            <Button Padding="0" Height="50" Margin="0" Style="{StaticResource NoBorderButtonStyle}" Background="Transparent" BorderThickness="0" Click="CreateGroup_ButtonClick">
                                 <StackPanel Orientation="Horizontal" Margin="13,0,5,0">
                                     <SymbolIcon Symbol="Add">
                                         <ToolTipService.ToolTip>