diff --git a/source/DerivedStyles/DetailsViewItemTemplate.xaml b/source/DerivedStyles/DetailsViewItemTemplate.xaml
index 30de9e2..a0c8efe 100644
--- a/source/DerivedStyles/DetailsViewItemTemplate.xaml
+++ b/source/DerivedStyles/DetailsViewItemTemplate.xaml
@@ -40,9 +40,11 @@
                                     Margin="0,0,0,0"  
                                     Opacity="0" DockPanel.Dock="Right"
                                     Height="{Binding Height, ElementName=PART_ImageIcon, Mode=OneWay}"
+                                            MaxHeight="25"
                                     RenderOptions.BitmapScalingMode="Fant" />
                             <Image Name="PART_ImageIcon"
                                    Height="{Settings DetailsViewListIconSize}"
+                                   Width="{Settings DetailsViewListIconSize}"
                                    RenderOptions.BitmapScalingMode="Fant"
                                    DockPanel.Dock="Left" Margin="0,0,8,0" />
                             <TextBlock Text="{Binding DisplayName}" TextTrimming="CharacterEllipsis" x:Name="DisplayName"
diff --git a/source/Views/DetailsViewGameOverview.xaml b/source/Views/DetailsViewGameOverview.xaml
index b6f0a74..7f00027 100644
--- a/source/Views/DetailsViewGameOverview.xaml
+++ b/source/Views/DetailsViewGameOverview.xaml
@@ -129,6 +129,12 @@
                                                     <Style TargetType="Button" BasedOn="{StaticResource PlayersCountButtonStyle}" />
                                                 </ContentControl.Resources>
                                             </ContentControl>
+
+                                            <ContentControl x:Name="GogSecondClassWatcher_SecondClassWatcherControl"
+                                                            DockPanel.Dock="Left" HorizontalAlignment="Left"
+                                                            VerticalAlignment="Center"
+                                                            Visibility="{PluginSettings Plugin=GogSecondClassWatcher, Path=IsControlVisible, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                            Margin="10,0,0,0"/>
                                         </DockPanel>
                                     </WrapPanel>
                                 </DockPanel>
diff --git a/source/Views/GridViewGameOverview.xaml b/source/Views/GridViewGameOverview.xaml
index f8b36e0..115c15a 100644
--- a/source/Views/GridViewGameOverview.xaml
+++ b/source/Views/GridViewGameOverview.xaml
@@ -110,13 +110,25 @@
 
                                 </DockPanel>
 
-                                <ContentControl DockPanel.Dock="Top" x:Name="DuplicateHider_SourceSelector" 
-                                        HorizontalAlignment="Right"
-                                        VerticalContentAlignment="Center"   
+                                <DockPanel Margin="0,5,0,0" DockPanel.Dock="Top" LastChildFill="False">
+                                    <ContentControl x:Name="DuplicateHider_SourceSelector" 
+                                        Visibility="{PluginSettings Plugin=DuplicateHider, Path=EnableUiIntegration, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                        DockPanel.Dock="Right"
+                                                    HorizontalAlignment="Right"
+                                        VerticalContentAlignment="Center"
+                                                    VerticalAlignment="Center"
                                         Margin="0,0,0,0"  
                                         Height="24"
                                         RenderOptions.BitmapScalingMode="Fant" />
 
+                                    <ContentControl x:Name="GogSecondClassWatcher_SecondClassWatcherControl"
+                                                    DockPanel.Dock="Right"
+                                                    HorizontalAlignment="Right"
+                                                            VerticalAlignment="Center"
+                                                            Visibility="{PluginSettings Plugin=GogSecondClassWatcher, Path=IsControlVisible, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                            Margin="0,0,10,0"/>
+                                </DockPanel>
+
                                 <Grid DockPanel.Dock="Top" Margin="0,10,0,10">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="*" MaxWidth="150" />