diff --git a/plugins/org.jkiss.dbeaver.core.application/plugin.properties b/plugins/org.jkiss.dbeaver.core.application/plugin.properties
index fb721e8b410b6037b1fa3a4894dfdc6194094aad..2d25ac2fe45aa8495872d98ebf3574c92b8ec4f3 100644
--- a/plugins/org.jkiss.dbeaver.core.application/plugin.properties
+++ b/plugins/org.jkiss.dbeaver.core.application/plugin.properties
@@ -29,6 +29,9 @@ view.templates.title=Templates
 menu.edit=Edit
 menu.navigate=Navigate
 
+command.org.jkiss.dbeaver.core.object.find.name=Search
+command.org.jkiss.dbeaver.core.object.find.description=Search for objects
+
 pref.page.name.db.configuration=Common
 pref.page.name.data.formats=Data Formats
 pref.page.name.query.manager=Query Manager
diff --git a/plugins/org.jkiss.dbeaver.core.application/plugin.xml b/plugins/org.jkiss.dbeaver.core.application/plugin.xml
index e5aad0992ed0b09096e2ff583f48b167ccffa74c..84ec3a53522c5b5f53843b43ecd77374640320d0 100644
--- a/plugins/org.jkiss.dbeaver.core.application/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core.application/plugin.xml
@@ -32,18 +32,44 @@
         </application>
     </extension>
 
+    <extension point="org.eclipse.ui.commands">
+        <command id="org.jkiss.dbeaver.core.object.find" name="%command.org.jkiss.dbeaver.core.object.find.name" description="%command.org.jkiss.dbeaver.core.object.find.description" categoryId="org.jkiss.dbeaver.core.database"/>
+    </extension>
+
+    <extension point="org.eclipse.ui.commandImages">
+        <image commandId="org.jkiss.dbeaver.core.object.find" icon="platform:/plugin/org.jkiss.dbeaver.core/icons/misc/find.png"/>
+    </extension>
+
     <extension point="org.eclipse.ui.views">
         <view id="org.eclipse.ui.views.ProgressView"
                 icon="icons/progress_view.png"
                 category="org.eclipse.ui"
                 class="org.eclipse.ui.ExtensionFactory:progressView"
                 name="%view.progress.title"/>
-
         <view id="org.eclipse.ui.texteditor.TemplatesView"
               name="%view.templates.title"
               icon="icons/templates_view.png"
               category="org.eclipse.ui"
               class="org.eclipse.ui.texteditor.templates.TemplatesView"/>
+        <view
+                id="org.eclipse.help.ui.HelpView"
+                category="org.jkiss.dbeaver.core.category"
+                class="org.jkiss.dbeaver.ui.help.LightweightHelpView"
+                allowMultiple="false"
+                icon="icons/help.png"
+                name="Help"/>
+    </extension>
+
+    <extension point="org.eclipse.ui.handlers">
+
+        <handler commandId="org.jkiss.dbeaver.core.object.find" class="org.jkiss.dbeaver.ui.search.NavigatorHandlerObjectFind">
+            <enabledWhen>
+                <with variable="activePart">
+                    <test property="org.jkiss.dbeaver.core.global.hasActiveProject"/>
+                </with>
+            </enabledWhen>
+        </handler>
+
     </extension>
 
     <extension point="org.eclipse.ui.menus">
@@ -64,6 +90,7 @@
         </menuContribution>
 
         <!-- Edit menu -->
+
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
             <menu id="edit" label="%menu.edit">
                 <command commandId="org.jkiss.dbeaver.ui.editors.sql.comment.single"><visibleWhen checkEnabled="true"/></command>
@@ -75,6 +102,7 @@
         </menuContribution>
 
         <!-- File menu-->
+
         <menuContribution allPopups="false" locationURI="menu:file?before=additions">
             <command commandId="org.eclipse.ui.newWizard"/>
             <command commandId="org.eclipse.ui.file.save"/>
@@ -94,6 +122,14 @@
             <command commandId="org.eclipse.ui.file.exit"/>
         </menuContribution>
 
+        <!-- Navigation menu -->
+
+        <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
+            <menu id="navigate" label="%menu.navigate">
+                <command commandId="org.jkiss.dbeaver.core.object.find"/>
+            </menu>
+        </menuContribution>
+
         <!-- Window menu -->
 
         <menuContribution allPopups="false" locationURI="menu:window?before=additions">
@@ -115,6 +151,11 @@
             <command commandId="org.eclipse.ui.window.preferences"/>
         </menuContribution>
 
+        <menuContribution allPopups="false" locationURI="toolbar:database?after=additions">
+            <command commandId="org.jkiss.dbeaver.core.object.find">
+                <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
+            </command>
+        </menuContribution>
     </extension>
 
     <extension point="org.eclipse.ui.bindings">
@@ -128,7 +169,8 @@
         <key commandId="org.eclipse.ui.edit.text.contentAssist.proposals" contextId="org.eclipse.ui.contexts.window" schemeId="org.jkiss.dbeaver.defaultKeyScheme" sequence="CTRL+SPACE"/>
         <key commandId="org.eclipse.ui.edit.text.hippieCompletion" contextId="org.eclipse.ui.contexts.window" schemeId="org.jkiss.dbeaver.defaultKeyScheme" sequence="CTRL+SHIFT+SPACE"/>
         <key commandId="org.eclipse.ui.edit.text.contentAssist.contextInformation" contextId="org.eclipse.ui.contexts.window" schemeId="org.jkiss.dbeaver.defaultKeyScheme" sequence="CTRL+ALT+SPACE"/>
-<!--
+        <key commandId="org.jkiss.dbeaver.core.object.find" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="CTRL+SHIFT+F"/>
+        <!--
         <key commandId="org.eclipse.ui.file.refresh" contextId="org.eclipse.ui.contexts.window" schemeId="org.jkiss.dbeaver.defaultKeyScheme" sequence="F5"/>
 
         <key commandId="org.eclipse.ui.newWizard" contextId="org.eclipse.ui.contexts.window" schemeId="org.jkiss.dbeaver.defaultKeyScheme" sequence="CTRL+N"/>
@@ -256,14 +298,4 @@
         </config>
     </extension>
 
-    <extension point="org.eclipse.ui.views">
-        <view
-                id="org.eclipse.help.ui.HelpView"
-                category="org.jkiss.dbeaver.core.category"
-                class="org.jkiss.dbeaver.ui.help.LightweightHelpView"
-                allowMultiple="false"
-                icon="icons/help.png"
-                name="Help"/>
-    </extension>
-
 </plugin>
diff --git a/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties b/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties
index 7f6e60640c1fe1747649aa997ae8051c7a52a0da..6b46cc8f24e69295f50c8f9b39b36f32da2479d9 100644
--- a/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties
+++ b/plugins/org.jkiss.dbeaver.core.application/plugin_ru.properties
@@ -23,11 +23,14 @@ productWebsite=http://dbeaver.jkiss.org/
 productEmail=serge@jkiss.org
 productIcon=icons/dbeaver.png
 
+view.progress.title=\u0424\u043E\u043D\u043E\u0432\u044B\u0435 \u0437\u0430\u0434\u0430\u0447\u0438
+view.templates.title=\u0428\u0430\u0431\u043B\u043E\u043D\u044B
+
 menu.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435
 menu.navigate=\u041D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u044F
 
-view.progress.title=\u0424\u043E\u043D\u043E\u0432\u044B\u0435 \u0437\u0430\u0434\u0430\u0447\u0438
-view.templates.title=\u0428\u0430\u0431\u043B\u043E\u043D\u044B
+command.org.jkiss.dbeaver.core.object.find.name=\u041D\u0430\u0439\u0442\u0438
+command.org.jkiss.dbeaver.core.object.find.description=\u041D\u0430\u0439\u0442\u0438 \u043E\u0431\u044A\u0435\u043A\u0442
 
 pref.page.name.db.configuration=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
 pref.page.name.data.formats=\u0424\u043E\u0440\u043C\u0430\u0442\u044B \u0434\u0430\u043D\u043D\u044B\u0445
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectFind.java b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/NavigatorHandlerObjectFind.java
similarity index 94%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectFind.java
rename to plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/NavigatorHandlerObjectFind.java
index 76db3a9fdd583ef443cec303ca59b56c2ad68eb8..15ce45dbc3febbeede14b4eb638d56547a921a3b 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/actions/navigator/NavigatorHandlerObjectFind.java
+++ b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/NavigatorHandlerObjectFind.java
@@ -16,7 +16,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-package org.jkiss.dbeaver.ui.actions.navigator;
+package org.jkiss.dbeaver.ui.search;
 
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsDialog.java b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsDialog.java
similarity index 100%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsDialog.java
rename to plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsDialog.java
diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsView.java b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsView.java
similarity index 100%
rename from plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsView.java
rename to plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/ui/search/SearchDatabaseObjectsView.java
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.properties b/plugins/org.jkiss.dbeaver.core/plugin.properties
index efa5f5fe7bf71b0f43c3dc935dc8cff7f179b6e7..f532747ddf8bea4f9a085a6288d5becdc61688fe 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.properties
+++ b/plugins/org.jkiss.dbeaver.core/plugin.properties
@@ -82,8 +82,6 @@ command.org.jkiss.dbeaver.core.object.create.name=Create Object
 command.org.jkiss.dbeaver.core.object.create.description=Create new database object
 command.org.jkiss.dbeaver.core.object.delete.name=Delete Object
 command.org.jkiss.dbeaver.core.object.delete.description=Delete database object
-command.org.jkiss.dbeaver.core.object.find.name=Search
-command.org.jkiss.dbeaver.core.object.find.description=Search for objects
 command.org.jkiss.dbeaver.core.object.filter.name=Filter
 command.org.jkiss.dbeaver.core.object.filter.description=Filter objects
 
diff --git a/plugins/org.jkiss.dbeaver.core/plugin.xml b/plugins/org.jkiss.dbeaver.core/plugin.xml
index c0d98dc8e484df61c0c5ac02c8a82ebe501edabd..7c324d26a2f1e1377283c8fb58a3c095b1f6a5f0 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.core/plugin.xml
@@ -191,7 +191,6 @@
         <command id="org.jkiss.dbeaver.core.object.open" name="%command.org.jkiss.dbeaver.core.object.open.name" description="%command.org.jkiss.dbeaver.core.object.open.description" categoryId="org.jkiss.dbeaver.core.database"/>
         <command id="org.jkiss.dbeaver.core.object.create" name="%command.org.jkiss.dbeaver.core.object.create.name" description="%command.org.jkiss.dbeaver.core.object.create.description" categoryId="org.jkiss.dbeaver.core.database"/>
         <command id="org.jkiss.dbeaver.core.object.delete" name="%command.org.jkiss.dbeaver.core.object.delete.name" description="%command.org.jkiss.dbeaver.core.object.delete.description" categoryId="org.jkiss.dbeaver.core.database"/>
-        <command id="org.jkiss.dbeaver.core.object.find" name="%command.org.jkiss.dbeaver.core.object.find.name" description="%command.org.jkiss.dbeaver.core.object.find.description" categoryId="org.jkiss.dbeaver.core.database"/>
         <command id="org.jkiss.dbeaver.core.object.filter" name="%command.org.jkiss.dbeaver.core.object.filter.name" description="%command.org.jkiss.dbeaver.core.object.filter.description" categoryId="org.jkiss.dbeaver.core.database"/>
 
         <command id="org.jkiss.dbeaver.ui.editors.sql.run.statement" name="%command.org.jkiss.dbeaver.ui.editors.sql.run.statement.name" description="%command.org.jkiss.dbeaver.ui.editors.sql.run.statement.description" categoryId="org.jkiss.dbeaver.core.sql"/>
@@ -264,7 +263,6 @@
         <image commandId="org.jkiss.dbeaver.core.object.open" icon="icons/tree/edit_item.png"/>
         <image commandId="org.jkiss.dbeaver.core.object.create" icon="IMG_TOOL_NEW_WIZARD"/>
         <image commandId="org.jkiss.dbeaver.core.object.delete" icon="IMG_ETOOL_DELETE"/>
-        <image commandId="org.jkiss.dbeaver.core.object.find" icon="icons/misc/find.png"/>
         <image commandId="org.jkiss.dbeaver.core.object.filter" icon="icons/misc/filter.png"/>
 
         <image commandId="org.jkiss.dbeaver.ui.editors.sql.run.statement" icon="icons/sql/sql_exec.png"/>
@@ -651,14 +649,6 @@
             </enabledWhen>
         </handler>
 
-        <handler commandId="org.jkiss.dbeaver.core.object.find" class="org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectFind">
-            <enabledWhen>
-                <with variable="activePart">
-                    <test property="org.jkiss.dbeaver.core.global.hasActiveProject"/>
-                </with>
-            </enabledWhen>
-        </handler>
-
         <handler commandId="org.eclipse.ui.edit.delete" class="org.jkiss.dbeaver.ui.actions.navigator.NavigatorHandlerObjectDelete">
             <activeWhen><reference definitionId="DBeaverNavigatorViewActive"/></activeWhen>
             <enabledWhen>
@@ -1200,9 +1190,7 @@
                 <command commandId="org.jkiss.dbeaver.core.sql.editor.create">
                     <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
                 </command>
-                <command commandId="org.jkiss.dbeaver.core.object.find">
-                    <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
-                </command>
+                <separator name="additions" visible="false"/>
             </toolbar>
             <toolbar id="txn" label="Transactions">
                 <visibleWhen><reference definitionId="DBeaverPerspectiveActive"/></visibleWhen>
@@ -1426,13 +1414,6 @@
             <dynamic id="org.jkiss.dbeaver.core.menu.project.active" class="org.jkiss.dbeaver.ui.actions.navigator.NavigatorActiveProjectContributor"/>
         </menuContribution>
 
-        <!-- Navigation menu -->
-        <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
-            <menu id="navigate" label="%menu.navigate">
-                <command commandId="org.jkiss.dbeaver.core.object.find"/>
-            </menu>
-        </menuContribution>
-
         <!-- SQL editor menu -->
         <menuContribution allPopups="false" locationURI="menu:org.eclipse.ui.main.menu?after=additions">
             <menu id="SQLEditorMenu" label="%menu.sqleditor">
@@ -1573,7 +1554,6 @@
         <key commandId="org.jkiss.dbeaver.core.resultset.rejectChanges" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="CTRL+ALT+R"/>
 
         <key commandId="org.jkiss.dbeaver.core.edit.copy.special" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="CTRL+SHIFT+C"/>
-        <key commandId="org.jkiss.dbeaver.core.object.find" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="CTRL+SHIFT+F"/>
         <key commandId="org.jkiss.dbeaver.core.navigator.bookmark.add" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="CTRL+D"/>
         <key commandId="org.jkiss.dbeaver.core.object.create" contextId="org.eclipse.ui.contexts.window" schemeId="org.eclipse.ui.defaultAcceleratorConfiguration" sequence="NUMPAD_ADD"/>
 
diff --git a/plugins/org.jkiss.dbeaver.core/plugin_ru.properties b/plugins/org.jkiss.dbeaver.core/plugin_ru.properties
index 39b7d1fe8f88b04e396335cb37a8de6ff3ca4a8d..255c140f7ba7e90dcd2003990aa74fee1e40e485 100644
--- a/plugins/org.jkiss.dbeaver.core/plugin_ru.properties
+++ b/plugins/org.jkiss.dbeaver.core/plugin_ru.properties
@@ -87,8 +87,6 @@ command.org.jkiss.dbeaver.core.object.create.name=\u0421\u043E\u0437\u0434\u0430
 command.org.jkiss.dbeaver.core.object.create.description=\u0421\u043E\u0437\u0434\u0430\u0442\u044C \u043D\u043E\u0432\u044B\u0439 \u043E\u0431\u044A\u0435\u043A\u0442 \u0431\u0430\u0437\u044B
 command.org.jkiss.dbeaver.core.object.delete.name=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442
 command.org.jkiss.dbeaver.core.object.delete.description=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043E\u0431\u044A\u0435\u043A\u0442 \u0431\u0430\u0437\u044B
-command.org.jkiss.dbeaver.core.object.find.name=\u041D\u0430\u0439\u0442\u0438
-command.org.jkiss.dbeaver.core.object.find.description=\u041D\u0430\u0439\u0442\u0438 \u043E\u0431\u044A\u0435\u043A\u0442
 command.org.jkiss.dbeaver.core.object.filter.name=\u0424\u0438\u043B\u044C\u0442\u0440
 command.org.jkiss.dbeaver.core.object.filter.description=\u0424\u0438\u043B\u044C\u0442\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u043F\u0438\u0441\u043E\u043A \u043E\u0431\u044A\u0435\u043A\u0442\u043E\u0432