diff --git a/features/org.jkiss.dbeaver.appstore.feature/feature.properties b/features/org.jkiss.dbeaver.appstore.feature/feature.properties
index 1ef4d967615bbd72d15d809cdda8082cd4bc66ce..7f1396306cb567c855a74f15ad442a0ff6d92fe3 100644
--- a/features/org.jkiss.dbeaver.appstore.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.appstore.feature/feature.properties
@@ -1,7 +1,7 @@
 featureName=DBeaver AppStore
 providerName=DBeaver Corp
 description=DBeaver Universal Database Manager standalone application.
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.appstore.feature/feature.xml b/features/org.jkiss.dbeaver.appstore.feature/feature.xml
index 4983198e6956587c6db6dd2d2767693702faf897..588c7c209b3d549bcaca0022f2564c42f8e6ef80 100644
--- a/features/org.jkiss.dbeaver.appstore.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.appstore.feature/feature.xml
@@ -32,6 +32,7 @@
 
     <includes id="org.jkiss.dbeaver.runtime.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.ui.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ui.extra.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.db.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.db.ui.feature" version="0.0.0"/>
 
diff --git a/features/org.jkiss.dbeaver.ce.feature/feature.properties b/features/org.jkiss.dbeaver.ce.feature/feature.properties
index b0b19276ea5f6ccfaf33a634aefaa4bf699b29de..13101f6a6f7c17540b685e27eb17f98166677886 100644
--- a/features/org.jkiss.dbeaver.ce.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.ce.feature/feature.properties
@@ -1,7 +1,7 @@
 featureName=DBeaver Community Edition
 providerName=JKISS
 description=Universal Database Manager.
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.ce.feature/feature.xml b/features/org.jkiss.dbeaver.ce.feature/feature.xml
index 021ce11ec2ac4f878acc9f6a5a6b17c58e656d13..12141b86e08d38904255ef0955fd70b6021f31e3 100644
--- a/features/org.jkiss.dbeaver.ce.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ce.feature/feature.xml
@@ -23,6 +23,7 @@
     </url>
 
     <includes id="org.jkiss.dbeaver.standalone.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ui.extra.feature" version="0.0.0"/>
 
     <plugin id="org.jkiss.dbeaver.ui.app.standalone" download-size="0" install-size="0" version="0.0.0"/>
 
diff --git a/features/org.jkiss.dbeaver.db.feature/feature.properties b/features/org.jkiss.dbeaver.db.feature/feature.properties
index fe041cf41d50ee3114f7bd9abbebe555db1e6991..f2c7b6f6f3c718148fddc3e44fe9adfab04f0854 100644
--- a/features/org.jkiss.dbeaver.db.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.db.feature/feature.properties
@@ -1,5 +1,5 @@
 featureName=DBeaver Databases
 providerName=JKISS
 description=DBeaver SQL databases support
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
diff --git a/features/org.jkiss.dbeaver.db.ui.feature/feature.properties b/features/org.jkiss.dbeaver.db.ui.feature/feature.properties
index d5edac3ca17d72b7436966c6c03bdce85d4ceb68..341b47b12f3c8cf44048bc492b9b84e9239859cf 100644
--- a/features/org.jkiss.dbeaver.db.ui.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.db.ui.feature/feature.properties
@@ -1,5 +1,5 @@
 featureName=DBeaver Databases UI
 providerName=JKISS
 description=DBeaver SQL databases UI
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
diff --git a/features/org.jkiss.dbeaver.debug.feature/feature.properties b/features/org.jkiss.dbeaver.debug.feature/feature.properties
index a6210cff352b0d234fa41195b7672dce0ff15c24..865858fbf39f5e9d18a943c6b237fe82e1e3e580 100644
--- a/features/org.jkiss.dbeaver.debug.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.debug.feature/feature.properties
@@ -1,7 +1,7 @@
 featureName=DBeaver Debug
 providerName=JKISS
 description=Database debugger functionality.
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.ext.ui.svg.feature/feature.properties b/features/org.jkiss.dbeaver.ext.ui.svg.feature/feature.properties
index a3adb3049ec670413a77ef0b25a1bfbb212f3592..4bd640e4df661054ab2e90718cf571daeff05693 100644
--- a/features/org.jkiss.dbeaver.ext.ui.svg.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.ext.ui.svg.feature/feature.properties
@@ -1,7 +1,7 @@
 featureName=DBeaver SVG Extension
 providerName=DBeaver Corp
 description=DBeaver SVG Extension
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=../../docs/licenses/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.ide.feature/feature.properties b/features/org.jkiss.dbeaver.ide.feature/feature.properties
index 566e4aec94b9087095c6276fe549f58ba139e8f5..93965ae10ba74f36463f3672dfd0800ffaa55afc 100644
--- a/features/org.jkiss.dbeaver.ide.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.ide.feature/feature.properties
@@ -1,5 +1,5 @@
 featureName=DBeaver IDE
 providerName=JKISS
 description=DBeaver IDE (Eclipse plugin)
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
diff --git a/features/org.jkiss.dbeaver.ide.feature/feature.xml b/features/org.jkiss.dbeaver.ide.feature/feature.xml
index 06db2ab25cf20da1cbd7a519a060c13ff5bcec5b..b077f42359cb7762b0fd863a8bcf4605cca2b7ec 100644
--- a/features/org.jkiss.dbeaver.ide.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ide.feature/feature.xml
@@ -20,6 +20,7 @@
 
     <includes id="org.jkiss.dbeaver.runtime.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.ui.feature" version="0.0.0"/>
+    <includes id="org.jkiss.dbeaver.ui.extra.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.db.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.db.ui.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.debug.feature" version="0.0.0"/>
diff --git a/features/org.jkiss.dbeaver.net.sshj.feature/feature.properties b/features/org.jkiss.dbeaver.net.sshj.feature/feature.properties
index 89d4d8ab6d861e0193ccc3f8b329b5be73d071c1..5cc48beebc8054c4411da84e3724bddeb0ab27f0 100644
--- a/features/org.jkiss.dbeaver.net.sshj.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.net.sshj.feature/feature.properties
@@ -16,7 +16,7 @@
 featureName=DBeaver SSHJ
 providerName=JKISS
 description=SSH tunnel implementation with BouncyCastle algorithms.
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=../../docs/licenses/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.rcp.feature/feature.properties b/features/org.jkiss.dbeaver.rcp.feature/feature.properties
index 3dc4fad6863c8a12777eb0fec0126df6ebdddc12..71c89d6ce8f6b650b3222814b58549030189d7b6 100644
--- a/features/org.jkiss.dbeaver.rcp.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.rcp.feature/feature.properties
@@ -1,7 +1,7 @@
 featureName=DBeaver RCP
 providerName=JKISS
 description=Universal Database Manager RCP.
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=../../docs/licenses/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.runtime.feature/feature.properties b/features/org.jkiss.dbeaver.runtime.feature/feature.properties
index a4fa4990d7f38807851ee60bb54dea2c7da4e7f3..714a70c802d06a01b697e466a1807bfecf02e273 100644
--- a/features/org.jkiss.dbeaver.runtime.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.runtime.feature/feature.properties
@@ -1,7 +1,7 @@
 featureName=DBeaver Runtime
 providerName=JKISS
 description=Universal Database Manager Runtime.
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.standalone.feature/feature.properties b/features/org.jkiss.dbeaver.standalone.feature/feature.properties
index 8ba8724e70fb097e8f52ecd8c5e4c78356f7058d..9a322464c30093611e5a3d3547cf117b159eafb3 100644
--- a/features/org.jkiss.dbeaver.standalone.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.standalone.feature/feature.properties
@@ -1,7 +1,7 @@
 featureName=DBeaver Standalone
 providerName=JKISS
 description=DBeaver Universal Database Manager standalone application.
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
 license=\
                                  Apache License\n\
diff --git a/features/org.jkiss.dbeaver.ui.extra.feature/build.properties b/features/org.jkiss.dbeaver.ui.extra.feature/build.properties
new file mode 100644
index 0000000000000000000000000000000000000000..b3a611b5c9309d4b5006519942f4e28a0e21e1e4
--- /dev/null
+++ b/features/org.jkiss.dbeaver.ui.extra.feature/build.properties
@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties
diff --git a/features/org.jkiss.dbeaver.ui.extra.feature/feature.properties b/features/org.jkiss.dbeaver.ui.extra.feature/feature.properties
new file mode 100644
index 0000000000000000000000000000000000000000..6d3422d91ca5d8258497adbacd3461fb17e41893
--- /dev/null
+++ b/features/org.jkiss.dbeaver.ui.extra.feature/feature.properties
@@ -0,0 +1,6 @@
+featureName=DBeaver Desktop UI Extras
+providerName=JKISS
+description=DBeaver Desktop UI
+copyright=(C) 2010-2021, DBeaver Corp
+licenseURL=https://dbeaver.io/files/dbeaver_license.txt
+
diff --git a/features/org.jkiss.dbeaver.ui.extra.feature/feature.xml b/features/org.jkiss.dbeaver.ui.extra.feature/feature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d835ffa68b2d13b1a2805ce6ee74fb6af305501a
--- /dev/null
+++ b/features/org.jkiss.dbeaver.ui.extra.feature/feature.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+        id="org.jkiss.dbeaver.ui.extra.feature"
+        label="%featureName"
+        version="1.0.0.qualifier"
+        provider-name="%providerName">
+
+    <description>
+        %description
+    </description>
+
+    <copyright>
+        %copyright
+    </copyright>
+
+    <license url="%licenseURL">
+        %license
+    </license>
+
+    <plugin id="org.jkiss.dbeaver.ext.ui.colortheme" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.ui.locks" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.tasks.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.tasks.native.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.tasks.sql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.import_config" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.format.sqlworkbenchj" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <!-- Compare -->
+    <plugin id="org.jkiss.dbeaver.cmp.simple.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <!-- Dashboards -->
+    <plugin id="org.jkiss.dbeaver.ui.dashboard" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+</feature>
diff --git a/features/org.jkiss.dbeaver.ui.extra.feature/pom.xml b/features/org.jkiss.dbeaver.ui.extra.feature/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f6ece9f239540e5c496cd2f4d2b65e6a459a69a3
--- /dev/null
+++ b/features/org.jkiss.dbeaver.ui.extra.feature/pom.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jkiss.dbeaver</groupId>
+    <artifactId>dbeaver</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+  <artifactId>org.jkiss.dbeaver.ui.extra.feature</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/org.jkiss.dbeaver.ui.feature/feature.properties b/features/org.jkiss.dbeaver.ui.feature/feature.properties
index 5df42cc4ea378212b11ed1de91d9667dbd56c8dd..31b90ddf21674cc340c54b2aadbf0ee91a684ab4 100644
--- a/features/org.jkiss.dbeaver.ui.feature/feature.properties
+++ b/features/org.jkiss.dbeaver.ui.feature/feature.properties
@@ -1,6 +1,6 @@
 featureName=DBeaver Desktop UI
 providerName=JKISS
 description=DBeaver Desktop UI
-copyright=(C) 2010-2020, DBeaver Corp
+copyright=(C) 2010-2021, DBeaver Corp
 licenseURL=https://dbeaver.io/files/dbeaver_license.txt
 
diff --git a/features/org.jkiss.dbeaver.ui.feature/feature.xml b/features/org.jkiss.dbeaver.ui.feature/feature.xml
index 5d7a03ddc73f10720dc0b633bea1c65bb5c3ec78..a179f89d3428dff442b4952acf6003bfb137cbff 100644
--- a/features/org.jkiss.dbeaver.ui.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ui.feature/feature.xml
@@ -51,17 +51,7 @@
     <plugin id="org.jkiss.dbeaver.ui.navigator" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ui.search" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.erd.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.ui.colortheme" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.ui.locks" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.tasks.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.tasks.native.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.tasks.sql.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.data.transfer.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.import_config" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.format.sqlworkbenchj" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-
-    <!-- Compare -->
-    <plugin id="org.jkiss.dbeaver.cmp.simple.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
     <!-- Gis -->
     <plugin id="org.jkiss.dbeaver.data.gis.view" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
@@ -69,6 +59,5 @@
     <!-- Charts -->
     <plugin id="org.jkiss.bundle.jfreechart" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ui.charts" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ui.dashboard" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
 </feature>
diff --git a/features/pom.xml b/features/pom.xml
index 23892dc30ed129fec5f6e8da124505cc3aae77a1..fdda7dea32b31e78d0787cb0a82089d11913eed7 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -27,6 +27,7 @@
             <modules>
                 <module>org.jkiss.dbeaver.rcp.feature</module>
                 <module>org.jkiss.dbeaver.ui.feature</module>
+                <module>org.jkiss.dbeaver.ui.extra.feature</module>
                 <module>org.jkiss.dbeaver.debug.feature</module>
 
                 <module>org.jkiss.dbeaver.db.ui.feature</module>