diff --git a/product/DBeaver.product b/product/DBeaver.product
index c4fe2f031d2e50b54e831d30fbf11dcbcbae5f64..5af335cff0933c33ec771321b5a6ee853371da4b 100644
--- a/product/DBeaver.product
+++ b/product/DBeaver.product
@@ -13,8 +13,12 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-showsplash</programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+      <programArgs>-showsplash
+      </programArgs>
+      <programArgsLin>--launcher.GTK_version 2
+      </programArgsLin>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+      </vmArgsMac>
    </launcherArgs>
 
    <windowImages i48="/org.jkiss.dbeaver.core.application/icons/dbeaver.png"/>
@@ -40,10 +44,10 @@
    <license>
         <url>http://dbeaver.jkiss.org/about/</url>
         <text>
-   DBeaver is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
-
-DBeaver is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+   DBeaver is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.
+
+DBeaver is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 See the GNU Lesser General Public License for more details.
          </text>
    </license>
diff --git a/product/installer/nsis/DBeaver.nsi b/product/installer/nsis/DBeaver.nsi
index 4f2258eb7d7112aac38bbcea22b4b63b381a8ef6..68b060e1acf2960188c7b9d84444fbf91edc5e75 100644
--- a/product/installer/nsis/DBeaver.nsi
+++ b/product/installer/nsis/DBeaver.nsi
@@ -171,6 +171,7 @@ Section "DBeaver" SecCore
   File "..\raw\win32.@arch@\dbeaver\.eclipseproduct"
   File "..\raw\win32.@arch@\dbeaver\readme.txt"
   File "..\raw\win32.@arch@\dbeaver\dbeaver.exe"
+  File "..\raw\win32.@arch@\dbeaver\dbeaver.ini"
   File /r "..\raw\win32.@arch@\dbeaver\configuration"
   ;File /r "..\raw\win32.@arch@\dbeaver\features"
   File /r "..\raw\win32.@arch@\dbeaver\plugins"