diff --git a/source/DerivedStyles/DetailsViewItemTemplate.xaml b/source/DerivedStyles/DetailsViewItemTemplate.xaml
index d9c8892..c7dca2f 100644
--- a/source/DerivedStyles/DetailsViewItemTemplate.xaml
+++ b/source/DerivedStyles/DetailsViewItemTemplate.xaml
@@ -39,7 +39,7 @@
                                     VerticalContentAlignment="Center"   
                                     Margin="0,0,0,0"  
                                     Opacity="0" DockPanel.Dock="Right"
-                                    Height="{Binding Height, ElementName=PART_ImageIcon, Mode=OneWay}"
+                                    Height="{Binding Height, ElementName=PART_ImageIcon, Mode=OneWay}" MaxHeight="25"
                                     RenderOptions.BitmapScalingMode="Fant" />
                             <Image Name="PART_ImageIcon"
                                    Height="{Settings DetailsViewListIconSize}"
diff --git a/source/Views/DetailsViewGameOverview.xaml b/source/Views/DetailsViewGameOverview.xaml
index a82d1f1..1bd64f3 100644
--- a/source/Views/DetailsViewGameOverview.xaml
+++ b/source/Views/DetailsViewGameOverview.xaml
@@ -289,13 +289,19 @@
 
                                             <ContentControl x:Name="LibraryManagement_PluginFeaturesIconList"
                                                 Height="35"
-                                                Margin="30,0,0,0"
+                                                Margin="15,0,0,0"
+                                                            VerticalAlignment="Center"
                                                 HorizontalAlignment="Center"
                                                 Opacity="0.85"
                                                 Visibility="{PluginSettings Plugin=LibraryManagement,
                                                                             Path=EnableIntegrationFeatures,
                                                                             FallbackValue=Collapsed,
                                                                             Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                                            <ContentControl x:Name="GogSecondClassWatcher_SecondClassWatcherControl"
+                                                            VerticalAlignment="Center"
+                                                            Visibility="{PluginSettings Plugin=GogSecondClassWatcher, Path=IsControlVisible, FallbackValue=Collapsed, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                                            Margin="5,0,0,0"/>
                                         </DockPanel>
 
                                     </StackPanel>
diff --git a/source/Views/GridViewGameOverview.xaml b/source/Views/GridViewGameOverview.xaml
index 34b6558..237771c 100644
--- a/source/Views/GridViewGameOverview.xaml
+++ b/source/Views/GridViewGameOverview.xaml
@@ -130,13 +130,24 @@
 
                                 </DockPanel>
 
-                                <ContentControl x:Name="DuplicateHider_SourceSelector"
-                                    Height="24"
-                                    Margin="0,0,0,0"
-                                    HorizontalAlignment="Right"
-                                    VerticalContentAlignment="Center"
-                                    DockPanel.Dock="Top"
-                                    RenderOptions.BitmapScalingMode="Fant" />
+                                <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 Margin="0,10,0,10" DockPanel.Dock="Top">
                                     <Grid.ColumnDefinitions>