diff --git a/plugins/org.jkiss.dbeaver.ext.erd/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.ext.erd/OSGI-INF/l10n/bundle_ru.properties
index fb180add0fa14ef3db368ee098e28709036841ba..53f99df2f7d846e0541323a55de667c651a6f95f 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.ext.erd/OSGI-INF/l10n/bundle_ru.properties
@@ -4,4 +4,5 @@ editor.erd.description=ERD \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u043
 menu.create.new.diagram=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u0443\u044E \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0443
 pref.page.name.erd.editor=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0434\u0438\u0430\u0433\u0440\u0430\u043C\u043C
 wizard.erd.name=\u0414\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0430
-wizard.erd.description=\u0414\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0430 \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0441\u0443\u0449\u043D\u043E\u0441\u0442\u0435\u0439 (ERD)
\ No newline at end of file
+wizard.erd.description=\u0414\u0438\u0430\u0433\u0440\u0430\u043C\u043C\u0430 \u0441\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u0445 \u0441\u0443\u0449\u043D\u043E\u0441\u0442\u0435\u0439 (ERD)
+page.org.jkiss.dbeaver.preferences.erd.general.name = ERD \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle.properties
index f6b8566b10d995d55b1be6937044ac8025394616..5ca27c954c9469d3f59ae78ff2dc63ec91b15fb5 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle.properties
@@ -61,6 +61,7 @@ tree.column.node.name              = Column
 tree.columns.node.name             = Columns
 tree.dataType.node.name            = Data Type
 tree.dataTypes.node.name           = Data Types
+tree.dataTypes.node.tip            = Global data types
 tree.foreign_key.node.name         = Foreign Key
 tree.foreign_key_columns.node.name = Foreign key columns
 tree.foreign_keys.node.name        = Foreign Keys
@@ -70,6 +71,7 @@ tree.functions.node.name           = Functions
 tree.index.node.name               = Index
 tree.index_columns.node.name       = Index columns
 tree.indexes.node.name             = Indexes
+tree.indexes.node.tip              = Indexes
 tree.package.node.name             = Package
 tree.packages.node.name            = Packages
 tree.procedure.node.name           = Procedure
@@ -88,10 +90,12 @@ tree.table.node.name               = Table
 tree.tableTriggers.node.name       = Table Triggers
 tree.tableTriggers.node.tip        = All table triggers
 tree.tables.node.name              = Tables
+tree.tables.node.tip               = Tables
 tree.trigger.node.name             = Trigger
 tree.triggers.node.name            = Triggers
 tree.tview.node.name               = View
 tree.tviews.node.name              = Views
+tree.tviews.node.tip               = Views
 tree.uni_key.columns.node.name     = Unique key columns
 tree.uni_key.node.name             = Unique Key
 tree.uni_keys.node.name            = Unique Keys
diff --git a/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle_ru.properties
index 0d596a7b0d6627c7c6b4378f139dc9c2cfafb008..d130957f0360a8849df87a6b5b7e58e48444919e 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle_ru.properties
+++ b/plugins/org.jkiss.dbeaver.ext.generic/OSGI-INF/l10n/bundle_ru.properties
@@ -2,14 +2,17 @@
 dialog.connection.header=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0431\u0430\u0437\u043E\u0432\u043E\u0433\u043E \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F
 
 tree.tables.node.name=\u0422\u0430\u0431\u043B\u0438\u0446\u044B
+tree.tables.node.tip=\u0422\u0430\u0431\u043B\u0438\u0446\u044B
 tree.table.node.name=\u0422\u0430\u0431\u043B\u0438\u0446\u0430
 tree.dataTypes.node.name=\u0422\u0438\u043F\u044B \u0434\u0430\u043D\u043D\u044B\u0445
+tree.dataTypes.node.tip=\u0413\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0435 \u0442\u0438\u043F\u044B \u0434\u0430\u043D\u043D\u044B\u0445
 tree.column.node.name=\u041A\u043E\u043B\u043E\u043D\u043A\u0430
 tree.columns.node.name=\u041A\u043E\u043B\u043E\u043D\u043A\u0438
 tree.foreign_keys.node.name=\u0412\u043D\u0435\u0448\u043D\u0438\u0435 \u043A\u043B\u044E\u0447\u0438
 tree.foreign_key.node.name=\u0412\u043D\u0435\u0448\u043D\u0438\u0439 \u043A\u043B\u044E\u0447
 tree.foreign_key_columns.node.name=\u041A\u043E\u043B\u043E\u043D\u043A\u0438 \u0432\u043D\u0435\u0448\u043D\u0435\u0433\u043E \u043A\u043B\u044E\u0447\u0430
 tree.indexes.node.name=\u0418\u043D\u0434\u0435\u043A\u0441\u044B
+tree.indexes.node.tip=\u0418\u043D\u0434\u0435\u043A\u0441\u044B
 tree.index.node.name=\u0418\u043D\u0434\u0435\u043A\u0441
 tree.index_columns.node.name=\u041A\u043E\u043B\u043E\u043D\u043A\u0438 \u0438\u043D\u0434\u0435\u043A\u0441\u0430
 tree.procedures.node.name=\u041F\u0440\u043E\u0446\u0435\u0434\u0443\u0440\u044B
@@ -30,6 +33,8 @@ tree.tableTriggers.node.name=\u0422\u0440\u0438\u0433\u0433\u0435\u0440\u044B \u
 tree.tableTriggers.node.tip=\u0412\u0441\u0435 \u0442\u0440\u0438\u0433\u0435\u0440\u044B \u0442\u0430\u0431\u043B\u0438\u0446
 tree.sequences.node.name=\u041F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438
 tree.sequences.node.tip=\u041F\u043E\u0441\u043B\u0435\u0434\u043E\u0432\u0430\u0442\u0435\u043B\u044C\u043D\u043E\u0441\u0442\u0438
+tree.tviews.node.name=\u041F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u044F
+tree.tviews.node.tip=\u041F\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u0438\u044F
 
 meta.org.jkiss.dbeaver.ext.generic.model.GenericTable.tableType.name=\u0422\u0438\u043F \u0422\u0430\u0431\u043B\u0438\u0446\u044B
 meta.org.jkiss.dbeaver.ext.generic.model.GenericTable.catalog.name=\u041A\u0430\u0442\u0430\u043B\u043E\u0433
diff --git a/plugins/org.jkiss.dbeaver.ext.generic/plugin.xml b/plugins/org.jkiss.dbeaver.ext.generic/plugin.xml
index fbcb43bc581ceeb50a94a76d792767faabf141b7..82fc9acca1236ca183cbf95d913f46f399c91e4c 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.ext.generic/plugin.xml
@@ -31,7 +31,7 @@
             <tree path="generic" label="Generic data source">
                 <items label="#catalog" path="catalog" property="catalogs" icon="#database" optional="true">
                     <items label="#schema" path="schema" property="schemas" icon="#schema" optional="true">
-                        <folder type="org.jkiss.dbeaver.ext.generic.model.GenericTable" label="%tree.tables.node.name" icon="#folder_table" description="Tables">
+                        <folder type="org.jkiss.dbeaver.ext.generic.model.GenericTable" label="%tree.tables.node.name" icon="#folder_table" description="%tree.tables.node.tip">
                             <items label="%tree.table.node.name" path="table" property="physicalTables" icon="#table">
                                 <folder type="org.jkiss.dbeaver.ext.generic.model.GenericTableColumn" label="%tree.columns.node.name" icon="#columns" description="Table columns">
                                     <items label="%tree.column.node.name" path="attribute" property="attributes" icon="#column">
@@ -68,7 +68,7 @@
                                 </items>
                             </items>
                         </folder>
-                        <folder type="org.jkiss.dbeaver.ext.generic.model.GenericTable" label="%tree.tviews.node.name" icon="#folder_view" description="Views">
+                        <folder type="org.jkiss.dbeaver.ext.generic.model.GenericTable" label="%tree.tviews.node.name" icon="#folder_view" description="%tree.tviews.node.tip">
                             <items label="%tree.tview.node.name" path="view" property="views" icon="#view">
                                 <folder type="org.jkiss.dbeaver.ext.generic.model.GenericTableColumn" label="%tree.columns.node.name" icon="#columns" description="View columns">
                                     <items label="%tree.column.node.name" path="attribute" property="attributes" icon="#column">
@@ -76,7 +76,7 @@
                                 </folder>
                             </items>
                         </folder>
-                        <folder type="org.jkiss.dbeaver.model.struct.rdb.DBSTableIndex" label="%tree.indexes.node.name" icon="#indexes" description="Indexes" visibleIf="object.dataSource.info.supportsIndexes()">
+                        <folder type="org.jkiss.dbeaver.model.struct.rdb.DBSTableIndex" label="%tree.indexes.node.name" icon="#indexes" description="%tree.indexes.node.tip" visibleIf="object.dataSource.info.supportsIndexes()">
                             <items icon="#index" label="%tree.index.node.name" path="index" property="indexes" virtual="true">
                                 <items icon="#column" label="%tree.index_columns.node.name" itemLabel="%tree.column.node.name" path="column" property="attributeReferences" inline="true" navigable="false" virtual="true">
                                 </items>
@@ -109,7 +109,7 @@
                         <folder type="org.jkiss.dbeaver.ext.generic.model.GenericTrigger" label="%tree.tableTriggers.node.name" icon="#triggers" description="%tree.tableTriggers.node.tip" visibleIf="object.dataSource.metaModel.supportsTriggers(object.dataSource)">
                             <items label="%tree.trigger.node.name" path="trigger" property="tableTriggers" icon="#trigger"/>
                         </folder>
-                        <folder type="org.jkiss.dbeaver.model.struct.DBSDataType" label="%tree.dataTypes.node.name" icon="#data_types" description="Global data types">
+                        <folder type="org.jkiss.dbeaver.model.struct.DBSDataType" label="%tree.dataTypes.node.name" icon="#data_types" description="%tree.dataTypes.node.tip">
                             <items label="%tree.dataType.node.name" path="dataType" property="dataTypes" icon="#data_type"/>
                         </folder>
                     </items>