diff --git a/DefaultControls/Button.xaml b/DefaultControls/Button.xaml
index 5985375..4a1ce96 100644
--- a/DefaultControls/Button.xaml
+++ b/DefaultControls/Button.xaml
@@ -35,5 +35,38 @@
                 <Setter Property="Foreground" Value="White" />
             </Trigger>
         </Style.Triggers>
-    </Style>                  
+    </Style>
+
+    <Style x:Key="ButtonGameEdit" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
+        <Setter Property="Background" Value="#BF3c3f47"/>
+        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border x:Name="Border" BorderThickness="0" Background="{TemplateBinding Background}"
+                            CornerRadius="5" Style="{DynamicResource HighlightBorder}">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter Property="Background" Value="#4a4e56"/>
+                            <Setter Property="Opacity" Value="1"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#4a4e56"/>
+                <Setter Property="Opacity" Value="1"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/DefaultControls/ListView.xaml b/DefaultControls/ListView.xaml
index 97bceae..fcdf9cb 100644
--- a/DefaultControls/ListView.xaml
+++ b/DefaultControls/ListView.xaml
@@ -124,8 +124,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListViewItem}">
                     <Grid>
-                        <Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="{DynamicResource HoverBrush}" />
-                        <Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="{DynamicResource GlyphBrush}" />
+                        <Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="#2f3036" />
+                        <Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="#5d6c95" />
                         <Border Padding="{TemplateBinding Padding}" Background="Transparent">
                             <GridViewRowPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Stretch" />
                         </Border>
@@ -136,6 +136,7 @@
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
+                            <Setter Property="Cursor" Value="Hand"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/DerivedStyles/DetailsViewItemStyle.xaml b/DerivedStyles/DetailsViewItemStyle.xaml
index a976c31..a61b304 100644
--- a/DerivedStyles/DetailsViewItemStyle.xaml
+++ b/DerivedStyles/DetailsViewItemStyle.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <Style x:Key="DetailsViewItemStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
+        <Setter Property="Foreground" Value="White" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
@@ -10,10 +10,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBoxItem}">
                     <Grid>
-                        <Border x:Name="SelectedRectangle" IsHitTestVisible="False" Visibility="Collapsed"
-                                                        BorderThickness="500,0,0,0" BorderBrush="#5d6c95"/>
-                        <Border x:Name="HoverRectangle" IsHitTestVisible="False" Visibility="Collapsed"
-                                                        BorderThickness="500,0,0,0" BorderBrush="#2f3036"/>
+                        <Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="#2f3036" />
+                        <Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="#5d6c95" />
                         <Border Padding="{TemplateBinding Padding}" Background="Transparent">
                             <ContentPresenter />
                         </Border>
@@ -24,14 +22,13 @@
                         </DataTrigger>
                         <DataTrigger Binding="{Binding IsInstalled}" Value="False">
                             <Setter Property="Foreground" Value="{StaticResource TextBrushDarker}" />
-                        </DataTrigger>                        
-                        <Trigger Property="IsSelected" Value="True">
+                        </DataTrigger>
+                        <Trigger Property="Selector.IsSelected" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="SelectedRectangle" />
-                            <Setter Property="Foreground" Value="White" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
-                            <Setter Property="Foreground" Value="White" />
+                            <Setter Property="Cursor" Value="Hand"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/DerivedStyles/GridViewItemStyle.xaml b/DerivedStyles/GridViewItemStyle.xaml
index 10990a4..bfe8889 100644
--- a/DerivedStyles/GridViewItemStyle.xaml
+++ b/DerivedStyles/GridViewItemStyle.xaml
@@ -6,6 +6,7 @@
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
         <Setter Property="RenderTransform">
             <Setter.Value>
                 <ScaleTransform />
@@ -17,7 +18,7 @@
                     <Grid Background="{DynamicResource GridItemBackgroundBrush}"
                           Margin="{Settings ItemSpacingMargin}"
                           x:Name="ItemGrid">
-                        <Border x:Name="SelectionBorder" BorderThickness="0" Margin="0" />
+                        <Border x:Name="SelectionBorder" BorderThickness="0"/>
                         <ContentPresenter />
                     </Grid>
                     <ControlTemplate.Triggers>
@@ -29,14 +30,17 @@
                             <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="SelectionBorder"/>
                             <Setter Property="Canvas.ZIndex" Value="90" />
                         </Trigger>
+                        <DataTrigger Binding="{Settings ShowGridItemBackground}" Value="False">
+                            <Setter Property="Background" Value="Transparent" TargetName="ItemGrid" />
+                        </DataTrigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard>
                                     <Storyboard>
                                         <DoubleAnimation
                                             Storyboard.TargetProperty="RenderTransform.ScaleX"
-                                            To="1.01"
-                                            Duration="0:0:.3"
+                                            To="1.05"
+                                            Duration="0:0:.5"
                                         >
                                             <DoubleAnimation.EasingFunction>
                                                 <CubicEase EasingMode="EaseOut"/>
@@ -44,8 +48,8 @@
                                         </DoubleAnimation>
                                         <DoubleAnimation
                                             Storyboard.TargetProperty="RenderTransform.ScaleY"
-                                            To="1.04"
-                                            Duration="0:0:.3"
+                                            To="1.05"
+                                            Duration="0:0:.5"
                                         >
                                             <DoubleAnimation.EasingFunction>
                                                 <CubicEase EasingMode="EaseOut"/>
@@ -60,7 +64,7 @@
                                         <DoubleAnimation
                                             Storyboard.TargetProperty="RenderTransform.ScaleX"
                                             To="1"
-                                            Duration="0:0:.2"
+                                            Duration="0:0:.4"
                                         >
                                             <DoubleAnimation.EasingFunction>
                                                 <CubicEase EasingMode="EaseOut"/>
@@ -69,7 +73,7 @@
                                         <DoubleAnimation
                                             Storyboard.TargetProperty="RenderTransform.ScaleY"
                                             To="1"
-                                            Duration="0:0:.2"
+                                            Duration="0:0:.4"
                                         >
                                             <DoubleAnimation.EasingFunction>
                                                 <CubicEase EasingMode="EaseOut"/>
@@ -79,9 +83,6 @@
                                 </BeginStoryboard>
                             </Trigger.ExitActions>
                         </Trigger>
-                        <DataTrigger Binding="{Settings ShowGridItemBackground}" Value="False">
-                            <Setter Property="Background" Value="Transparent" TargetName="ItemGrid" />
-                        </DataTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/DerivedStyles/GridViewItemTemplate.xaml b/DerivedStyles/GridViewItemTemplate.xaml
index c7c766e..6b28b7a 100644
--- a/DerivedStyles/GridViewItemTemplate.xaml
+++ b/DerivedStyles/GridViewItemTemplate.xaml
@@ -4,11 +4,35 @@
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
                     mc:Ignorable="d">
 
+    <Style x:Key="ControlButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="FontSize" Value="30" />
+        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Foreground" Value="#66bba8ab" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <TextBlock FontSize="{TemplateBinding FontSize}"
+                               Foreground="{TemplateBinding Foreground}"
+                               Text="{TemplateBinding Content}"
+                               TextWrapping="Wrap"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="White" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="#66707070" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    
     <Style x:Key="GridViewItemTemplate" TargetType="{x:Type GameListItem}">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GameListItem}">
-                    <Border BorderThickness="{Settings GridItemMargin}" BorderBrush="{DynamicResource GridItemBackgroundBrush}">
+                    <Border BorderThickness="{Settings GridItemMargin}" BorderBrush="Transparent" Cursor="Hand">
                         <StackPanel Name="PART_PanelHost"
                                     d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameIntance}">
 
@@ -18,26 +42,33 @@
                                    RenderOptions.BitmapScalingMode="Fant" StretchDirection="Both"
                                    HorizontalAlignment="Center" VerticalAlignment="Center"
                                    Stretch="{Settings CoverArtStretch}" />
-
-                                <Border Background="#99000000" x:Name="TextGameName" Visibility="Collapsed">
+                                <Border Background="#90000000" x:Name="TextGameName" Visibility="Collapsed">
                                     <TextBlock Text="{Binding DisplayName}"
                                            TextWrapping="Wrap" Margin="5"
                                            Style="{StaticResource BaseTextBlockStyle}"
                                            TextTrimming="CharacterEllipsis" TextAlignment="Center"
                                            HorizontalAlignment="Center" VerticalAlignment="Center"/>
                                 </Border>
-                                <Border Background="#1AFFFFFF" x:Name="BorderMouseOver" Visibility="Collapsed">
-                                    <Viewbox VerticalAlignment="Center" HorizontalAlignment="Center">
-                                        <StackPanel Orientation="Horizontal">
-                                            <Button Name="PART_ButtonPlay" Style="{StaticResource SimpleButton}"
-                                                Margin="20,0,2,0" VerticalAlignment="Center"
+                                <Border Background="#1DFFFFFF" x:Name="BorderMouseOver" Visibility="Collapsed" />
+                                <Border Background="#AA000000" x:Name="BorderDarken" Visibility="Collapsed" />
+                                <Viewbox Name="GameControls"  Visibility="Collapsed">
+                                    <StackPanel Width="200" Height="267">
+                                        <Border Name="BorderControl" Margin="10,225,0,0" CornerRadius="4" BorderBrush="#40414141" BorderThickness="1" Height="40" Width="40" 
+                                                HorizontalAlignment="Left" Background="#803a3a3a">
+                                            <Rectangle Fill="Transparent" Height="10" Width="10" HorizontalAlignment="Left"/>
+                                        </Border>
+                                        <Border Margin="0,-40,10,0" CornerRadius="4" BorderBrush="#40414141" BorderThickness="1" Height="40" Width="40" 
+                                                HorizontalAlignment="Right" Background="#803a3a3a">
+                                                        </Border>
+                                        <Button Name="PART_ButtonPlay" Style="{StaticResource ControlButton}"
+                                                Margin="15,-39,0,0" HorizontalAlignment="Left" VerticalAlignment="Center"
                                                 Content="&#xec74;" FontFamily="{StaticResource FontIcoFont}" />
-                                            <Button Name="PART_ButtonInfo" Style="{StaticResource SimpleButton}"
-                                                Margin="2,0,20,0" VerticalAlignment="Center"
-                                                Content="&#xef4f;" FontFamily="{StaticResource FontIcoFont}" />
-                                        </StackPanel>
-                                    </Viewbox>
-                                </Border>
+
+                                        <Button Name="PART_ButtonInfo" Style="{StaticResource ControlButton}"
+                                                Margin="0,-40,17,0" HorizontalAlignment="Right" VerticalAlignment="Center"
+                                                Content="&#128712;" FontFamily="{StaticResource FontIcoFont}" />
+                                    </StackPanel>
+                                </Viewbox>
                             </Grid>
                             <TextBlock Text="{Binding DisplayName}"
                                    Style="{DynamicResource BaseTextBlockStyle}"                                                                   
@@ -52,6 +83,13 @@
                         <DataTrigger Binding="{Binding IsInstalled}" Value="False">
                             <Setter Property="Content" Value="&#xef08;" TargetName="PART_ButtonPlay" />
                         </DataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding IsInstalled}" Value="False" />
+                                <Condition Binding="{Settings DarkenUninstalledGamesGrid}" Value="True" />
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Visibility" Value="Visible" TargetName="BorderDarken" />
+                        </MultiDataTrigger>
                         <MultiDataTrigger>
                             <MultiDataTrigger.Conditions>
                                 <Condition Binding="{Binding CoverImage}" Value="{x:Null}" />
@@ -61,6 +99,7 @@
                         </MultiDataTrigger>
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Visibility" Value="Visible" TargetName="BorderMouseOver"/>
+                            <Setter Property="Visibility" Value="Visible" TargetName="GameControls"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/DerivedStyles/HighlightBorder.xaml b/DerivedStyles/HighlightBorder.xaml
index 257a285..bc09b84 100644
--- a/DerivedStyles/HighlightBorder.xaml
+++ b/DerivedStyles/HighlightBorder.xaml
@@ -13,5 +13,22 @@
                 <Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" />
             </Trigger>
         </Style.Triggers>
-    </Style>                  
+    </Style>
+
+    <Style x:Key="HighlightBackground" TargetType="Border" BasedOn="{StaticResource {x:Type Border}}">
+        <Setter Property="Background" Value="#3F000000"/>
+        <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
+        <Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#3e4047" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="Background" Value="#3e4047" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    
 </ResourceDictionary>
\ No newline at end of file
diff --git a/DerivedStyles/PlayButton.xaml b/DerivedStyles/PlayButton.xaml
index 7a510aa..8ee09bf 100644
--- a/DerivedStyles/PlayButton.xaml
+++ b/DerivedStyles/PlayButton.xaml
@@ -1,7 +1,9 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    
     <Style x:Key="PlayButton" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
         <Setter Property="FontFamily" Value="Corbel"/>
+        <Setter Property="Cursor" Value="Hand"/>
         <Setter Property="Typography.Capitals" Value="AllSmallCaps"/>
         <Setter Property="FontSize" Value="25"/>
         <Setter Property="Width" Value="Auto"/>
@@ -57,7 +59,9 @@
                         <Border x:Name="DefaultBorder" BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="0"  Background="{TemplateBinding Background}"
                                 Opacity="1" CornerRadius="{DynamicResource ControlCornerRadius}"/>
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"/>
+                        <TextBlock Text="↓" Opacity="0.9" FontFamily="Cambria" Padding="15,0,0,2"  FontSize="22" FontWeight="Light" Background="Transparent" Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
+                        <TextBlock Text="␣" Opacity="0.9" FontFamily="Times New Roman" Padding="10,0,0,2"  FontSize="25" FontWeight="Light" Background="Transparent" Foreground="{DynamicResource TextBrush}" VerticalAlignment="Center"/>
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="34,0,15,0" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True"/>
                     </Grid>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsEnabled" Value="True" />
diff --git a/DerivedStyles/Simplebutton.xaml b/DerivedStyles/Simplebutton.xaml
new file mode 100644
index 0000000..728d322
--- /dev/null
+++ b/DerivedStyles/Simplebutton.xaml
@@ -0,0 +1,28 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Style x:Key="SimpleButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="FontSize" Value="{DynamicResource FontSize}" />
+        <Setter Property="Margin" Value="0,3,0,3" />
+        <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <TextBlock FontSize="{TemplateBinding FontSize}"
+                               Foreground="{TemplateBinding Foreground}"
+                               Text="{TemplateBinding Content}"
+                               TextWrapping="Wrap"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+            </Trigger>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Images/info.png b/Images/info.png
new file mode 100644
index 0000000..39bf451
Binary files /dev/null and b/Images/info.png differ
diff --git a/Images/infohovered.png b/Images/infohovered.png
new file mode 100644
index 0000000..01920ed
Binary files /dev/null and b/Images/infohovered.png differ
diff --git a/Images/settings.png b/Images/settings.png
new file mode 100644
index 0000000..314046e
Binary files /dev/null and b/Images/settings.png differ
diff --git a/Images/settingshovered.png b/Images/settingshovered.png
new file mode 100644
index 0000000..5968f45
Binary files /dev/null and b/Images/settingshovered.png differ
diff --git a/README.md b/README.md
index faf1a6e..1d1efc9 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,40 @@
 # SteamNite-High-Res
 A custom theme that mimics the Steam client's look for Playnite. Version for 1440p and 4K screens.
+
+![img](https://i.imgur.com/qR4NZTk.png)
+
+![img](https://i.imgur.com/Pj62FSA.png)
+
+![img](https://i.imgur.com/nHBHpgd.png)
+
+## Installation
+
+Just drag and drop the .pthm file into Playnite's window
+
+## Usage
+
+The whole interface is based on the new Steam UI, which means you can use assets you used on your Steam library with this skin.
+
+![img](https://i.imgur.com/lucOPx2.png)
+
+If you want to achieve the same look as in the screenshots, here are my recommended settings :
+
+![img](https://i.imgur.com/v1msy5v.png)
+
+![img](https://i.imgur.com/BPRqtm0.png)
+
+![img](https://i.imgur.com/BBfAijh.png)
+
+![img](https://i.imgur.com/gMZzYiS.png)
+
+![img](https://i.imgur.com/XKv8JRd.png)
+
+Games' icon are used as logos. Unfortunately, you can't change logos' location or size in Playnite itself. You can do it by editing an XAML file, however this applies to every logo. Here's how :
+
+- Head to your Playnite's install directory (by default C:\Users\"User"\AppData\Local\Playnite)
+
+- Go to Themes > Desktop > SteamNite > Views and open "DetailsViewGameOverview.xaml"
+
+- Go to line 39, where it says "Name="PART_ImageIcon". You can edit logos' size with "MaxHeight" and "MaxWidth" values, as well as logos' location by editing "VerticalAlignment" and "HorizontalAlignment". Accepted values are Center, Top, Bottom and Center, Left, Right.
+
+- Don't hesitate to report bugs and give me feedbacks. I'll try to polish the skin as much as possible. Also don't hesitate to edit the skin yourself if you know how to use Microsoft Blend.
diff --git a/Views/DetailsViewGameOverview.xaml b/Views/DetailsViewGameOverview.xaml
index ab56d77..c573be2 100644
--- a/Views/DetailsViewGameOverview.xaml
+++ b/Views/DetailsViewGameOverview.xaml
@@ -12,7 +12,7 @@
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="530"/>
                                 <RowDefinition Height="599*"/>
-                                <RowDefinition Height="661*"/>
+                                <RowDefinition Height="561*"/>
                             </Grid.RowDefinitions>
                             <FadeImage x:Name="PART_ImageBackground" Stretch="UniformToFill" HorizontalAlignment="Stretch" VerticalAlignment="Top">
                                 <FadeImage.ImageOpacityMask>
@@ -32,17 +32,18 @@
                                     <RowDefinition Height="63*"/>
                                     <RowDefinition Height="61*"/>
                                 </Grid.RowDefinitions>
-                                <DockPanel HorizontalAlignment="Stretch" Margin="15,260,0,0" MaxWidth="1920" Grid.Row="1" Grid.RowSpan="2">
+                                <DockPanel HorizontalAlignment="Stretch" Margin="15,260,0,0" Grid.Row="1" Grid.RowSpan="2">
                                     <StackPanel VerticalAlignment="Bottom" DockPanel.Dock="Left">
                                         <DockPanel>
                                             <Canvas>
                                                 <Image Canvas.Left="0" Canvas.Bottom="0" Name="PART_ImageIcon" MaxHeight="180" MaxWidth="500" DockPanel.Dock="Left" Margin="0,0,0,5" VerticalAlignment="Bottom" HorizontalAlignment="Left" RenderOptions.BitmapScalingMode="Fant" />
                                             </Canvas>
                                         </DockPanel>
+                                        <Rectangle Fill="#262b33" Height="4" HorizontalAlignment="Stretch" Margin="-25,0,-25,-135"/>
                                         <Image Source="{ThemeFile 'Images/blurbar.png'}" Height="60" Stretch="Fill" Margin="-27,8,-27,-70">
-                                        <Image.Effect>
-                                            <BlurEffect Radius="1" KernelType="Box"/>
-                                        </Image.Effect>
+                                            <Image.Effect>
+                                                <BlurEffect Radius="1" KernelType="Box"/>
+                                            </Image.Effect>
                                         </Image>
                                         <Grid Margin="0,0,0,7">
                                             <Grid.ColumnDefinitions>
@@ -52,7 +53,7 @@
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="Auto"/>
                                             </Grid.ColumnDefinitions>
-                                            <Button Grid.Column="0" Name="PART_ButtonPlayAction" 
+                                            <Button Grid.Column="0" Name="PART_ButtonPlayAction" Cursor="Hand"
                                                     HorizontalAlignment="Left" Style="{DynamicResource PlayButton}" Margin="0,15,0,0"/>
                                             <Button Grid.Column="0" Name="PART_ButtonContextAction" 
                                                     HorizontalAlignment="Left" Style="{DynamicResource ContextButton}" Margin="0,15,0,0"/>
@@ -76,9 +77,9 @@
                                         </Grid>
                                     </StackPanel>
                                 </DockPanel>
-                                <DockPanel HorizontalAlignment="Left" MaxWidth="1920" Grid.Row="3" Grid.RowSpan="2" Width="Auto">
-                                    <StackPanel DockPanel.Dock="Left" HorizontalAlignment="Stretch" Margin="15,0,0,0">
-                                        <Grid Background="#34000000" Height="170">
+                                <DockPanel HorizontalAlignment="Stretch" Grid.Row="3" Grid.RowSpan="2" Width="Auto">
+                                    <StackPanel DockPanel.Dock="Left" Margin="15,0,0,0">
+                                        <Grid Background="#34000000">
                                             <Grid.ColumnDefinitions>
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="Auto"/>
@@ -87,6 +88,7 @@
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="Auto"/>
                                                 <ColumnDefinition Width="Auto"/>
+                                                <ColumnDefinition Width="Auto"/>
                                             </Grid.ColumnDefinitions>
                                             <Image Grid.Column="0" Name="PART_ImageCover" HorizontalAlignment="Center" VerticalAlignment="Top" Height="150" StretchDirection="Both" Stretch="Uniform" RenderOptions.BitmapScalingMode="Fant" Margin="10,10,0,10">
                                                 <Image.Effect>
@@ -141,7 +143,13 @@
                                                     <ItemsControl Padding="0,3,0,0" Name="PART_ItemsCategories" VerticalAlignment="Top" Margin="0,0,0,0"/>
                                                 </ScrollViewer>
                                             </GridEx>
-                                            <GridEx ColumnCount="2" AutoLayoutColumns="2" RowCount="20" Grid.Column="6" Margin="15,0,0,0" Height="150">
+                                            <GridEx ColumnCount="2" AutoLayoutColumns="2" RowCount="50" Grid.Column="6" Margin="15,0,0,0" Height="150">
+                                                <Label Name="PART_ElemFeatures" Content="{DynamicResource LOCFeaturesLabel}" VerticalAlignment="Top" Margin="0,0,30,0" Foreground="#626164" Height="30"/>
+                                                <ScrollViewer VerticalScrollBarVisibility="Hidden" MaxHeight="150">
+                                                    <ItemsControl Padding="0,3,0,0" Name="PART_ItemsFeatures" VerticalAlignment="Top" Margin="0,0,0,0"/>
+                                                </ScrollViewer>
+                                            </GridEx>
+                                            <GridEx ColumnCount="2" AutoLayoutColumns="2" RowCount="20" Grid.Column="7" Margin="15,0,0,0" Height="150">
                                                 <Label Name="PART_ElemSource" Content="{DynamicResource LOCSourceLabel}" Margin="0,0,30,0" Foreground="#626164" Height="30"/>
                                                 <Button Padding="0" Background="Transparent" Name="PART_ButtonSource" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="#d3d3d3" Height="30"/>
 
@@ -157,18 +165,56 @@
                                                     </ItemsPanelTemplate>
                                                 </ItemsControl.ItemsPanel>
                                                 <ItemsControl.ItemContainerStyle>
-                                                    <Style>
+                                                    <Style TargetType="ContentPresenter">
                                                         <Setter Property="FrameworkElement.Margin" Value="30,0,50,0"/>
                                                     </Style>
                                                 </ItemsControl.ItemContainerStyle>
                                             </ItemsControl>
                                         </Grid>
-                                        <HtmlTextView x:Name="PART_HtmlDescription" Margin="0,0,0,0" HtmlFontSize="{DynamicResource FontSize}" HtmlFontFamily="{DynamicResource FontFamily}" HtmlForeground="#898989" LinkForeground="{DynamicResource GlyphColor}"
+                                        <HtmlTextView x:Name="PART_HtmlDescription" HtmlFontSize="{DynamicResource FontSize}" HtmlFontFamily="{DynamicResource FontFamily}" HtmlForeground="#898989" LinkForeground="{DynamicResource GlyphColor}"
                                                       Height="540"/>
                                     </StackPanel>
                                 </DockPanel>
                             </Grid>
-                            <Button x:Name="PART_ButtonMoreActions" Content="ⓘ" FontSize="18" Width="35" Height="35" Margin="0,450,20,0" HorizontalAlignment="Right"/>
+                            <StackPanel Width="Auto" Orientation="Horizontal" Margin="0,0,20,0" HorizontalAlignment="Stretch" FlowDirection="RightToLeft">
+                                <Button Style="{DynamicResource ButtonGameEdit}" x:Name="PART_ButtonMoreActions" Opacity="0.85" Padding="0" Width="35" Height="35" Margin="0,450,10,0" Cursor="Hand">
+                                    <Button.Content>
+                                        <Image Width="20" RenderOptions.BitmapScalingMode="NearestNeighbor">
+                                            <Image.Style>
+                                                <Style TargetType="Image">
+                                                    <Setter Property="Source" Value="../Images/info.png"/>
+                                                    <Setter Property="Opacity" Value="0.75"/>
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="Source" Value="../Images/infohovered.png"/>
+                                                            <Setter Property="Opacity" Value="1"/>
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </Image.Style>
+                                        </Image>
+                                    </Button.Content>
+                                </Button>
+                                <Button Style="{DynamicResource ButtonGameEdit}" x:Name="PART_ButtonEditGame" Opacity="0.85" Focusable="False" FontSize="18" Width="35" Height="35" Margin="0,450,0,0" Padding="0" Cursor="Hand">
+                                    <Button.Content>
+                                        <Image Height="20" Width="18">
+                                            <Image.Style>
+                                                <Style TargetType="Image">
+                                                    <Setter Property="Source" Value="../Images/settings.png"/>
+                                                    <Setter Property="Opacity" Value="0.75"/>
+                                                    <Style.Triggers>
+                                                <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="Source" Value="../Images/settingshovered.png"/>
+                                                            <Setter Property="Opacity" Value="1"/>
+                                                        </Trigger>
+                                            </Style.Triggers>
+                                                </Style>
+                                            </Image.Style>
+                                        </Image>
+                                    </Button.Content>
+                                </Button>
+                                <Canvas Width="700"/>
+                            </StackPanel>
                         </Grid>
                     </ScrollViewer>
                 </ControlTemplate>
diff --git a/Views/ExplorerPanel.xaml b/Views/ExplorerPanel.xaml
index a5374da..2c58b6f 100644
--- a/Views/ExplorerPanel.xaml
+++ b/Views/ExplorerPanel.xaml
@@ -24,10 +24,10 @@
                                 </Style.Triggers>
                             </Style>
                         </Border.Style>
-                        <DockPanel Background="{TemplateBinding Background}">
-                            <ComboBox Name="PART_SelectFields"
+                        <DockPanel Background="#24282f">
+                            <ComboBox Name="PART_SelectFields" Cursor="Hand"
                                   DockPanel.Dock="Top" Margin="5,8,5,8" />
-                            <ListBox Name="PART_SelectItems"
+                            <ListBox Name="PART_SelectItems"  Cursor="Hand"
                                  DockPanel.Dock="Top" Margin="5,0,5,8"                                      
                                  BorderThickness="0"
                                  ScrollViewer.HorizontalScrollBarVisibility="Disabled">
diff --git a/Views/FilterPanel.xaml b/Views/FilterPanel.xaml
index 73c3eed..833a1f0 100644
--- a/Views/FilterPanel.xaml
+++ b/Views/FilterPanel.xaml
@@ -30,7 +30,7 @@
                                         DockPanel.Dock="Right" Margin="0,-5,5,0" FontSize="25"
                                         Name="PART_ButtonClose"/>
                                 <Button DockPanel.Dock="Left" Content="{StaticResource LOCClearFilters}"                                        
-                                        HorizontalAlignment="Left"
+                                        HorizontalAlignment="Left" Cursor="Hand"
                                         Style="{StaticResource SimpleButton}"
                                         Name="PART_ButtonClear"/>
                             </DockPanel>
@@ -41,6 +41,7 @@
                                         <Style x:Key="FilterCheck" TargetType="CheckBox" BasedOn="{StaticResource {x:Type CheckBox}}">
                                             <Setter Property="Margin" Value="8,2,6,8" />
                                             <Setter Property="BorderThickness" Value="0" />
+                                            <Setter Property="Cursor" Value="Hand"/>
                                             <Style.Triggers>
                                                 <Trigger Property="IsChecked" Value="{StaticResource False}">
                                                     <Setter Property="Opacity" Value="0.6" />
@@ -49,6 +50,10 @@
                                         </Style>
                                         <Style x:Key="FilterLabel" TargetType="Label" BasedOn="{StaticResource {x:Type Label}}">
                                             <Setter Property="Margin" Value="8,10,6,4" />
+                                            <Setter Property="FontWeight" Value="Bold" />
+                                            <Setter Property="FontSize" Value="16"/>
+                                            <Setter Property="FontFamily" Value="Corbel"/>
+                                            <Setter Property="Typography.Capitals" Value="AllSmallCaps"/>
                                             <Style.Triggers>
                                                 <Trigger Property="Tag" Value="{StaticResource False}">
                                                     <Setter Property="Opacity" Value="0.6"/>
@@ -74,28 +79,28 @@
                                         </Style>
                                     </StackPanel.Resources>
 
-                                    <CheckBox Name="PART_ToggleInstalled" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleInstalled" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameIsInstalledTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentInstalledCount" ContentStringFormat="({0})"/>
                                         </StackPanel>
                                     </CheckBox>
 
-                                    <CheckBox Name="PART_ToggleUnInstalled" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleUnInstalled" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameIsUnInstalledTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentUnInstalledCount" ContentStringFormat="({0})"/>
                                         </StackPanel>
                                     </CheckBox>
 
-                                    <CheckBox Name="PART_ToggleHidden" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleHidden" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameHiddenTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentHiddenCount" ContentStringFormat="({0})"/>
                                         </StackPanel>
                                     </CheckBox>
 
-                                    <CheckBox Name="PART_ToggleFavorite" Style="{StaticResource FilterCheck}">
+                                    <CheckBox Name="PART_ToggleFavorite" Style="{StaticResource FilterCheck}" Cursor="Hand">
                                         <StackPanel Orientation="Horizontal">
                                             <TextBlock Text="{StaticResource LOCGameFavoriteTitle}" Margin="0,0,5,0"/>
                                             <ContentControl Name="PART_ContentFavoriteCount" ContentStringFormat="({0})"/>
@@ -110,12 +115,12 @@
                                     <!--Library-->
                                     <Label Name="PART_ElemLibraryLabel" Content="{StaticResource LOCLibrary}"  Foreground="#FF00E8FF"
                                        Style="{StaticResource FilterLabel}" />
-                                    <FilterSelectionBox x:Name="PART_FilterLibrary" />
+                                    <FilterSelectionBox x:Name="PART_FilterLibrary"/>
 
                                     <!--Name-->
                                     <Label Name="PART_ElemNameLabel" Content="{StaticResource LOCNameLabel}" Foreground="#FF00E8FF"
                                        Style="{StaticResource FilterLabel}" />
-                                    <SearchBox x:Name="PART_FilterName" />
+                                    <SearchBox x:Name="PART_FilterName"/>
 
                                     <!--Genre-->
                                     <Label Name="PART_ElemGenreLabel" Content="{StaticResource LOCGenreLabel}" Foreground="#FF00E8FF"
diff --git a/Views/GridViewGameOverview.xaml b/Views/GridViewGameOverview.xaml
index b455986..72eb102 100644
--- a/Views/GridViewGameOverview.xaml
+++ b/Views/GridViewGameOverview.xaml
@@ -63,13 +63,31 @@
 
                                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal"
                                             Margin="0,10,0,10">
-                                    <Button Name="PART_ButtonPlayAction" 
+                                    <Button Name="PART_ButtonPlayAction" Cursor="Hand"
                                              Style="{DynamicResource PlayButton}" />
                                     <Button Name="PART_ButtonContextAction" 
                                             Style="{DynamicResource ContextButton}"/>
-                                    <Button Name="PART_ButtonMoreActions" Margin="120,0,0,0" VerticalAlignment="Top"
-                                            Content="ⓘ" FontSize="18"
-                                            Width="35" Height="35"/>
+                                    <Button Style="{DynamicResource ButtonGameEdit}" Name="PART_ButtonMoreActions" Margin="120,0,0,0" VerticalAlignment="Top" Width="35" Height="35" Padding="0" Cursor="Hand">
+                                        <Button.Content>
+                                            <Image Width="20" RenderOptions.BitmapScalingMode="NearestNeighbor" Margin="0,0,-40,0">
+                                                <Image.Style>
+                                                    <Style TargetType="Image">
+                                                        <Setter Property="Source" Value="../Images/info.png"/>
+                                                        <Setter Property="Opacity" Value="0.75"/>
+                                                        <Style.Triggers>
+                                                            <Trigger Property="IsMouseOver" Value="True">
+                                                                <Setter Property="Source" Value="../Images/infohovered.png"/>
+                                                                <Setter Property="Opacity" Value="1"/>
+                                                            </Trigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Image.Style>
+                                                <Image.RenderTransform>
+                                                    <ScaleTransform ScaleX="-1"/>
+                                                </Image.RenderTransform>
+                                            </Image>
+                                        </Button.Content>
+                                    </Button>
                                 </StackPanel>
 
                                 <ScrollViewer DockPanel.Dock="Top" HorizontalAlignment="Stretch"
diff --git a/Views/LibraryGridView.xaml b/Views/LibraryGridView.xaml
index e8b2e2f..008ba43 100644
--- a/Views/LibraryGridView.xaml
+++ b/Views/LibraryGridView.xaml
@@ -13,7 +13,7 @@
                                d:DataContext="{x:Static DesignMainViewModel.DesignIntance}">
                         <GridViewGameOverview x:Name="PART_ControlGameView"
                                               Width="{Settings GrdiDetailsWitdh}"
-                                              DockPanel.Dock="{Settings GridViewDetailsPosition}" />                   
+                                              DockPanel.Dock="{Settings GridViewDetailsPosition}" />
                         <Grid DockPanel.Dock="Left">
                             <Grid.RowDefinitions>
                                 <RowDefinition Height="*" />
@@ -32,9 +32,41 @@
                                     </DataTemplate>
                                 </ExtendedListBox.ItemTemplate>
                             </ExtendedListBox>
-                            <StackPanel Margin="5" Orientation="Horizontal" Grid.Row="1">
-                                <Label Content="{DynamicResource LOCZoomLabel}" Margin="10,0,10,0"/>
-                                <SliderWithPopup x:Name="PART_SliderZoom" />
+                            <StackPanel Orientation="Horizontal" Grid.Row="1" Background="#B323282e" VerticalAlignment="Center" Height="30">
+                                <Label Content="{DynamicResource LOCZoomLabel}" Margin="10,0,10,0" VerticalAlignment="Center"/>
+                                <SliderWithPopup x:Name="PART_SliderZoom" VerticalAlignment="Center"/>
+                                <Label Content="{DynamicResource LOCLibrary}" Margin="20,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock x:Name="PART_TextLastActivity" Background="Transparent" Text="{Binding SelectedGame.Library}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCPlatformTitle}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Name="PART_ButtonPlatform" Text="{Binding SelectedGame.Platform}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCDeveloperLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Developers[0]}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCPublisherLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Publishers[0]}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCGenreLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Genres[0]}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCGameReleaseDateTitle}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.ReleaseYear}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCAgeRatingLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.AgeRating}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                                <Label Content="{DynamicResource LOCVersionLabel}" Margin="10,0,0,0" Foreground="White" FontSize="15" VerticalAlignment="Center"/>
+                                <TextBlock Text=":" Foreground="White" FontSize="15" Margin="5,0,5,0" VerticalAlignment="Center"/>
+                                <TextBlock Background="Transparent" Text="{Binding SelectedGame.Version}" HorizontalAlignment="Left" Foreground="#e6e6e6" FontSize="15" VerticalAlignment="Center"/>
+                                <Rectangle Height="15" Width="3" Fill="White" VerticalAlignment="Center" Margin="10,0,0,0"/>
                             </StackPanel>
                         </Grid>
                     </DockPanel>
diff --git a/Views/MainPanel.xaml b/Views/MainPanel.xaml
index 5b82857..7b32575 100644
--- a/Views/MainPanel.xaml
+++ b/Views/MainPanel.xaml
@@ -24,65 +24,62 @@
                         </Border.Style>
                         <DockPanel Margin="0,3,110,3">
                             <Border x:Name="PART_ElemMainMenu" Background="Transparent" Width="19"
-                                    DockPanel.Dock="Left" Margin="10,0,10,0" Cursor="Hand"
+                                    DockPanel.Dock="Left" Margin="10,0,10,0"
                                     WindowChrome.IsHitTestVisibleInChrome="True">
                                 <StackPanel>
-                                <Rectangle Fill="White" Width="16" Height="1" Margin="0,10,0,4"/>
-                                <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,4"/>
-                                <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,0"/>
+                                    <Rectangle Fill="White" Width="16" Height="1" Margin="0,10,0,4"/>
+                                    <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,4"/>
+                                    <Rectangle Fill="White" Width="16" Height="1" Margin="0,0,0,0"/>
                                 </StackPanel>
                             </Border>
 
                             <SearchBox x:Name="PART_TextMainSearch"
                                         Margin="5,1,-30,1" DockPanel.Dock="Left"
                                         WindowChrome.IsHitTestVisibleInChrome="True"
-                                        Width="290" Background="#3F000000" BorderBrush="Transparent"
-                                       />
+                                        Width="290" Background="#3F000000" BorderBrush="Transparent"/>
 
-
-                            <CheckBox x:Name="PART_ToggleFilter"
+                            <Border MinWidth="25"  Padding="5" MaxWidth="200" Margin="40,0,-27.5,0" Height="34" CornerRadius="5" Style="{DynamicResource HighlightBackground}" BorderThickness="0" Cursor="Hand">
+                                <CheckBox x:Name="PART_ToggleFilter" Cursor="Hand"
                                       WindowChrome.IsHitTestVisibleInChrome="True"
-                                      DockPanel.Dock="Left" Margin="0,1,0,1" MinWidth="35">
-                                <CheckBox.Style>
-                                    <Style TargetType="CheckBox">
-                                        <Setter Property="Template">
-                                            <Setter.Value>
-                                                <ControlTemplate>
-                                                    <!--<Border Style="{DynamicResource HighlightBorder}"-->
-                                                    <!--Background="Transparent">-->
-                                                    <StackPanel Orientation="Horizontal" Margin="0,0,0,0">
-                                                        <Image Source="{ThemeFile 'Images/searchsettings.png'}"
-                                                                    Height="15" RenderOptions.BitmapScalingMode="Fant"
-                                                                    Margin="0,0,0,0" Name="Tweakbutton"  Cursor="Hand"/>
-                                                        <TextBlock Text="{StaticResource LOCFilterActiveLabel}"
+                                      DockPanel.Dock="Left" MinWidth="20">
+                                    <CheckBox.Style>
+                                        <Style TargetType="CheckBox">
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate>
+                                                        <StackPanel Orientation="Horizontal" Height="25">
+                                                            <Image Source="{ThemeFile 'Images/searchsettings.png'}"
+                                                                    Height="15" RenderOptions.BitmapScalingMode="Fant" 
+                                                                      Name="Tweakbutton" Cursor="Hand"/>
+                                                            <TextBlock Text="{StaticResource LOCFilterActiveLabel}"
                                                                        Style="{StaticResource BaseTextBlockStyle}"
-                                                                       Margin="15,0,0,0" VerticalAlignment="Center"
+                                                                       Margin="10,0,0,0" VerticalAlignment="Center"
                                                                        Name="TextFilter" />
-                                                    </StackPanel>
-                                                    <!--</Border>-->
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="Tag" Value="{StaticResource True}">
-                                                            <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
-                                                            <Setter Property="Visibility" Value="Visible" TargetName="TextFilter" />
-                                                        </Trigger>
-                                                        <Trigger Property="Tag" Value="{StaticResource False}">
-                                                            <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
-                                                            <Setter Property="Visibility" Value="Collapsed" TargetName="TextFilter" />
-                                                        </Trigger>
-                                                    </ControlTemplate.Triggers>
-                                                </ControlTemplate>
-                                            </Setter.Value>
-                                        </Setter>
-                                    </Style>
-                                </CheckBox.Style>
-                            </CheckBox>
-                            <Border x:Name="PART_ElemViewMenu" Background="#3F000000" BorderThickness="0"
-                                    DockPanel.Dock="Left" Margin="12,0,0,0" Width="36"
+                                                        </StackPanel>
+                                                        <ControlTemplate.Triggers>
+                                                            <Trigger Property="Tag" Value="{StaticResource True}">
+                                                                <Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
+                                                                <Setter Property="Visibility" Value="Visible" TargetName="TextFilter" />
+                                                            </Trigger>
+                                                            <Trigger Property="Tag" Value="{StaticResource False}">
+                                                                <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
+                                                                <Setter Property="Visibility" Value="Collapsed" TargetName="TextFilter" />
+                                                            </Trigger>
+                                                        </ControlTemplate.Triggers>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Style>
+                                    </CheckBox.Style>
+                                </CheckBox>
+                            </Border>
+                            <Border x:Name="PART_ElemViewMenu" BorderThickness="0" Cursor="Hand"
+                                    DockPanel.Dock="Left" Margin="35,0,0,0" Width="33" Height="34" CornerRadius="5"
                                     WindowChrome.IsHitTestVisibleInChrome="True"
-                                    Style="{DynamicResource HighlightBorder}">
+                                    Style="{DynamicResource HighlightBackground}">
                                 <Image Source="{ThemeFile 'Images/views.png'}"
                                        Height="27" RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                       Margin="-1,-1,1,0" Name="Tweakbutton"  Cursor="Hand"/>
+                                       Margin="0,-1,1,0" Name="Tweakbutton"/>
                             </Border>
 
                             <CheckBox x:Name="PART_ToggleNotifications"
diff --git a/theme.yaml b/theme.yaml
index 43b931d..cf23949 100644
--- a/theme.yaml
+++ b/theme.yaml
@@ -1,4 +1,4 @@
 Name: SteamNite High-Res
 Author: Le Malgache
-Version: 2.1
+Version: 2.3.1
 ThemeApiVersion: 1.4.1