diff --git a/source/main.dfm b/source/main.dfm
index b523be99..d53a0987 100644
--- a/source/main.dfm
+++ b/source/main.dfm
@@ -1822,38 +1822,35 @@ object MainForm: TMainForm
       object N7: TMenuItem
         Caption = '-'
       end
+      object ExportdatabaseasSQL1: TMenuItem
+        Action = actExportTables
+      end
+      object Exportgridrows1: TMenuItem
+        Action = actExportData
+      end
+      object Synchronizedatabase2: TMenuItem
+        Action = actSynchronizeDatabase
+      end
+      object N9: TMenuItem
+        Caption = '-'
+      end
+      object LoadSQLfile1: TMenuItem
+        Action = actLoadSQL
+      end
+      object ImportCSVfile1: TMenuItem
+        Action = actImportCSV
+      end
+      object InsertfilesintoTEXTBLOBfields1: TMenuItem
+        Action = actInsertFiles
+      end
+      object N4: TMenuItem
+        Caption = '-'
+      end
       object MenuPreferences: TMenuItem
         Tag = 36
         Action = actPreferences
       end
     end
-    object Import1: TMenuItem
-      Caption = '&Import'
-      object MenuImportTextFile: TMenuItem
-        Tag = 43
-        Action = actImportCSV
-      end
-      object ImportSQL1: TMenuItem
-        Action = actLoadSQL
-      end
-      object InsertfilesintoBLOBfields1: TMenuItem
-        Action = actInsertFiles
-      end
-    end
-    object ImExport1: TMenuItem
-      Tag = 20
-      Caption = 'E&xport'
-      object MenuExport: TMenuItem
-        Tag = 45
-        Action = actExportTables
-      end
-      object Exportdata1: TMenuItem
-        Action = actExportData
-      end
-      object Synchronizedatabase1: TMenuItem
-        Action = actSynchronizeDatabase
-      end
-    end
     object Help1: TMenuItem
       Tag = 22
       Caption = '&Help'
diff --git a/source/main.pas b/source/main.pas
index 3ba0b4f3..ea69c581 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -89,9 +89,7 @@ type
     actExitApplication: TAction;
     Extra1: TMenuItem;
     FlushUserPrivileges1: TMenuItem;
-    MenuExport: TMenuItem;
     N5: TMenuItem;
-    MenuImportTextFile: TMenuItem;
     Flush1: TMenuItem;
     MenuFlushLogs: TMenuItem;
     MenuFlushHosts: TMenuItem;
@@ -107,7 +105,6 @@ type
     actAboutBox: TAction;
     actMaintenance: TAction;
     menuMaintenance: TMenuItem;
-    ImExport1: TMenuItem;
     actPrintList: TAction;
     actCopyTable: TAction;
     ControlBar1: TControlBar;
@@ -133,22 +130,18 @@ type
     OpenDialog2: TOpenDialog;
     menuSupportForum: TMenuItem;
     actExportData: TAction;
-    Exportdata1: TMenuItem;
     actExecuteCurrentQuery: TAction;
     actDataPreview: TAction;
     actInsertFiles: TAction;
-    InsertfilesintoBLOBfields1: TMenuItem;
     actExportTables: TAction;
     actDropObjects: TAction;
     actLoadSQL: TAction;
-    ImportSQL1: TMenuItem;
     menuConnections: TPopupMenu;
     menuFeaturetracker: TMenuItem;
     menuDownload: TMenuItem;
     btnSQLHelp: TToolButton;
     menuSQLHelp1: TMenuItem;
     N8a: TMenuItem;
-    Import1: TMenuItem;
     tlbSep6: TToolButton;
     menuUpdateCheck: TMenuItem;
     ImageListMain: TImageList;
@@ -504,8 +497,15 @@ type
     actToggleComment: TAction;
     Uncomment1: TMenuItem;
     actSynchronizeDatabase: TAction;
-    Synchronizedatabase1: TMenuItem;
     Disconnect1: TMenuItem;
+    N4: TMenuItem;
+    ImportCSVfile1: TMenuItem;
+    LoadSQLfile1: TMenuItem;
+    InsertfilesintoTEXTBLOBfields1: TMenuItem;
+    N9: TMenuItem;
+    ExportdatabaseasSQL1: TMenuItem;
+    Exportgridrows1: TMenuItem;
+    Synchronizedatabase2: TMenuItem;
     procedure actCreateDBObjectExecute(Sender: TObject);
     procedure menuConnectionsPopup(Sender: TObject);
     procedure actExitApplicationExecute(Sender: TObject);