diff --git a/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj b/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
index 3087af440..9ee14a530 100644
--- a/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
+++ b/Mono.Addins.GuiGtk3/Mono.Addins.GuiGtk3.csproj
@@ -16,10 +16,321 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
-    <PackageReference Include="GtkSharp" Version="3.22.25.98" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.95" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="icons\**\*.png" LinkBase="icons" />
+    <EmbeddedResource Include="icons\download-16.png">
+      <LogicalName>download-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\download-16%402x.png">
+      <LogicalName>download-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\download-16~dark.png">
+      <LogicalName>download-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\download-16~dark%402x.png">
+      <LogicalName>download-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16.png">
+      <LogicalName>installed-overlay-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16%402x.png">
+      <LogicalName>installed-overlay-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16~dark.png">
+      <LogicalName>installed-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16~dark%402x.png">
+      <LogicalName>installed-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16~sel.png">
+      <LogicalName>installed-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16~sel%402x.png">
+      <LogicalName>installed-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16~dark~sel.png">
+      <LogicalName>installed-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\installed-overlay-16~dark~sel%402x.png">
+      <LogicalName>installed-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-x-generic.png">
+      <LogicalName>package-x-generic.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-x-generic_16.png">
+      <LogicalName>package-x-generic_16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\package-x-generic_22.png">
+      <LogicalName>package-x-generic_22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16.png">
+      <LogicalName>plugin-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16%402x.png">
+      <LogicalName>plugin-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16~dark.png">
+      <LogicalName>plugin-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16~dark%402x.png">
+      <LogicalName>plugin-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16~sel.png">
+      <LogicalName>plugin-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16~sel%402x.png">
+      <LogicalName>plugin-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16~dark~sel.png">
+      <LogicalName>plugin-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-16~dark~sel%402x.png">
+      <LogicalName>plugin-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22.png">
+      <LogicalName>plugin-22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22%402x.png">
+      <LogicalName>plugin-22@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22~dark.png">
+      <LogicalName>plugin-22~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22~dark%402x.png">
+      <LogicalName>plugin-22~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22~sel.png">
+      <LogicalName>plugin-22~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22~sel%402x.png">
+      <LogicalName>plugin-22~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22~dark~sel.png">
+      <LogicalName>plugin-22~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-22~dark~sel%402x.png">
+      <LogicalName>plugin-22~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32.png">
+      <LogicalName>plugin-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32%402x.png">
+      <LogicalName>plugin-32@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32~dark.png">
+      <LogicalName>plugin-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32~dark%402x.png">
+      <LogicalName>plugin-32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32~sel.png">
+      <LogicalName>plugin-32~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32~sel%402x.png">
+      <LogicalName>plugin-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32~dark~sel.png">
+      <LogicalName>plugin-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-32~dark~sel%402x.png">
+      <LogicalName>plugin-32~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16.png">
+      <LogicalName>plugin-avail-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16%402x.png">
+      <LogicalName>plugin-avail-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16~dark.png">
+      <LogicalName>plugin-avail-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16~dark%402x.png">
+      <LogicalName>plugin-avail-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16~sel.png">
+      <LogicalName>plugin-avail-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16~sel%402x.png">
+      <LogicalName>plugin-avail-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16~dark~sel.png">
+      <LogicalName>plugin-avail-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-16~dark~sel%402x.png">
+      <LogicalName>plugin-avail-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-avail-32.png">
+      <LogicalName>plugin-avail-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32.png">
+      <LogicalName>plugin-disabled-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32%402x.png">
+      <LogicalName>plugin-disabled-32@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32~dark.png">
+      <LogicalName>plugin-disabled-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32~dark%402x.png">
+      <LogicalName>plugin-disabled-32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32~sel%402x.png">
+      <LogicalName>plugin-disabled-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32~sel.png">
+      <LogicalName>plugin-disabled-32~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32~dark~sel%402x.png">
+      <LogicalName>plugin-disabled-32~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-disabled-32~dark~sel.png">
+      <LogicalName>plugin-disabled-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16.png">
+      <LogicalName>plugin-update-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16%402x.png">
+      <LogicalName>plugin-update-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16~dark.png">
+      <LogicalName>plugin-update-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16~dark%402x.png">
+      <LogicalName>plugin-update-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16~sel.png">
+      <LogicalName>plugin-update-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16~sel%402x.png">
+      <LogicalName>plugin-update-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16~dark~sel.png">
+      <LogicalName>plugin-update-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-16~dark~sel%402x.png">
+      <LogicalName>plugin-update-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22.png">
+      <LogicalName>plugin-update-22.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22%402x.png">
+      <LogicalName>plugin-update-22@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22~dark.png">
+      <LogicalName>plugin-update-22~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22~dark%402x.png">
+      <LogicalName>plugin-update-22~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22~sel.png">
+      <LogicalName>plugin-update-22~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22~sel%402x.png">
+      <LogicalName>plugin-update-22~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22~dark~sel.png">
+      <LogicalName>plugin-update-22~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-22~dark~sel%402x.png">
+      <LogicalName>plugin-update-22~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32.png">
+      <LogicalName>plugin-update-32.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32%402x.png">
+      <LogicalName>plugin-update-32@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32~dark.png">
+      <LogicalName>plugin-update-32~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32~dark%402x.png">
+      <LogicalName>plugin-update-32~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32~sel.png">
+      <LogicalName>plugin-update-32~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32~sel%402x.png">
+      <LogicalName>plugin-update-32~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32~dark~sel.png">
+      <LogicalName>plugin-update-32~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\plugin-update-32~dark~sel%402x.png">
+      <LogicalName>plugin-update-32~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-16.png">
+      <LogicalName>update-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-16%402x.png">
+      <LogicalName>update-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-16~dark.png">
+      <LogicalName>update-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-16~dark%402x.png">
+      <LogicalName>update-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16.png">
+      <LogicalName>update-available-overlay-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16%402x.png">
+      <LogicalName>update-available-overlay-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16~dark.png">
+      <LogicalName>update-available-overlay-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16~dark%402x.png">
+      <LogicalName>update-available-overlay-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16~sel.png">
+      <LogicalName>update-available-overlay-16~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16~sel%402x.png">
+      <LogicalName>update-available-overlay-16~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16~dark~sel.png">
+      <LogicalName>update-available-overlay-16~dark~sel.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\update-available-overlay-16~dark~sel%402x.png">
+      <LogicalName>update-available-overlay-16~dark~sel@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-search-16.png">
+      <LogicalName>icons.web-search-16.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-search-16%402x.png">
+      <LogicalName>icons.web-search-16@2x.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-search-16~dark.png">
+      <LogicalName>icons.web-search-16~dark.png</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="icons\web-search-16~dark%402x.png">
+      <LogicalName>icons.web-search-16~dark@2x.png</LogicalName>
+    </EmbeddedResource>
+ <EmbeddedResource Include="interfaces\AddinManagerDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.AddinManagerDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\AddinInfoView.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.AddinInfoView.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\AddinInstallerDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.AddinInstallerDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\ManageSitesDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.ManageSitesDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\InstallDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.InstallDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\ProgressDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.ProgressDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\NewSiteDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.NewSiteDialog.ui</LogicalName>
+    </EmbeddedResource>
+    <EmbeddedResource Include="interfaces\ErrorDialog.ui.xml">
+      <LogicalName>Mono.Addins.GuiGtk3.interfaces.ErrorDialog.ui</LogicalName>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Mono.Addins.Setup\Mono.Addins.Setup.csproj" />
diff --git a/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui.xml b/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui.xml
index d4c3d1fa3..aa8dee30c 100644
--- a/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui.xml
+++ b/Mono.Addins.GuiGtk3/interfaces/AddinInfoView.ui.xml
@@ -5,7 +5,7 @@
   <object class="GtkBox" id="AddinInfoView">
     <property name="can_focus">False</property>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+           <!-- <property name="fill">True</property>-->
     <child>
       <object class="GtkEventBox" id="ebox">
         <property name="can_focus">False</property>
diff --git a/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui.xml b/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui.xml
index 45aff3f28..f2171bade 100644
--- a/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui.xml
+++ b/Mono.Addins.GuiGtk3/interfaces/AddinManagerDialog.ui.xml
@@ -15,7 +15,7 @@
         <property name="orientation">vertical</property>
         <property name="spacing">3</property>
 		<property name="expand">True</property>
-        <property name="fill">True</property>
+       <!-- <property name="fill">True</property>-->
         <child>
           <object class="GtkBox" id="vbox93">
             <property name="can_focus">False</property>
@@ -23,7 +23,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <property name="expand">True</property>
-            <property name="fill">True</property>
+           <!-- <property name="fill">True</property>-->
             <child>
               <object class="GtkHBox" id="hbox65">
                 <property name="can_focus">False</property>
@@ -85,11 +85,11 @@
                                                       <signal name="EnableDisableClicked" handler="OnEnableDisableClicked" swapped="no"/>
                                                    </object>-->                                </child>
                                 <property name="expand">True</property>
-                                <property name="fill">True</property>
+                               <!-- <property name="fill">True</property>-->
                               </object>
                               <packing>
                                 <property name="expand">False</property>
-                                <property name="fill">False</property>
+                               <!-- <property name="fill">False</property>-->
                                 <property name="position">1</property>
                               </packing>
                             </child>
diff --git a/Test/GuiTester/GuiTester.csproj b/Test/GuiTester/GuiTester.csproj
index 019f3605a..f389babe3 100644
--- a/Test/GuiTester/GuiTester.csproj
+++ b/Test/GuiTester/GuiTester.csproj
@@ -33,7 +33,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
-    <PackageReference Include="GtkSharp" Version="3.22.25.128" />
+    <PackageReference Include="GtkSharp" Version="3.24.24.95" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="gtk-gui\gui.stetic">
@@ -54,4 +54,4 @@
       <Name>Mono.Addins.GuiGtk3</Name>
     </ProjectReference>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>