diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui
index c75c8328..dd10e7c0 100644
--- a/forms/mainwindow.ui
+++ b/forms/mainwindow.ui
@@ -2867,6 +2867,13 @@
     <addaction name="action_Save"/>
     <addaction name="action_Save_Project"/>
     <addaction name="separator"/>
+    <addaction name="action_NewMap"/>
+    <addaction name="action_NewLayout"/>
+    <addaction name="actionNew_Tileset"/>
+    <addaction name="actionDuplicate_Current_Map_Layout"/>
+    <addaction name="separator"/>
+    <addaction name="actionImport_Map_from_Advance_Map_1_92"/>
+    <addaction name="separator"/>
     <addaction name="action_Export_Map_Image"/>
     <addaction name="actionExport_Stitched_Map_Image"/>
     <addaction name="actionExport_Map_Timelapse_Image"/>
@@ -2906,16 +2913,9 @@
     <addaction name="actionMove"/>
     <addaction name="actionMap_Shift"/>
     <addaction name="separator"/>
-    <addaction name="action_NewMap"/>
-    <addaction name="action_NewLayout"/>
-    <addaction name="actionNew_Tileset"/>
-    <addaction name="actionDuplicate_Current_Map_Layout"/>
-    <addaction name="separator"/>
     <addaction name="actionTileset_Editor"/>
     <addaction name="actionRegion_Map_Editor"/>
     <addaction name="separator"/>
-    <addaction name="actionImport_Map_from_Advance_Map_1_92"/>
-    <addaction name="separator"/>
     <addaction name="actionOpen_Project_in_Text_Editor"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
diff --git a/forms/paletteeditor.ui b/forms/paletteeditor.ui
index c1a4ee7a..c98d49b6 100644
--- a/forms/paletteeditor.ui
+++ b/forms/paletteeditor.ui
@@ -120,6 +120,12 @@
      <height>37</height>
     </rect>
    </property>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>File</string>
+    </property>
+    <addaction name="actionImport_Palette"/>
+   </widget>
    <widget class="QMenu" name="menuEdit">
     <property name="title">
      <string>Edit</string>
@@ -127,14 +133,8 @@
     <addaction name="actionUndo"/>
     <addaction name="actionRedo"/>
    </widget>
-   <widget class="QMenu" name="menuTools">
-    <property name="title">
-     <string>Tools</string>
-    </property>
-    <addaction name="actionImport_Palette"/>
-   </widget>
+   <addaction name="menuFile"/>
    <addaction name="menuEdit"/>
-   <addaction name="menuTools"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <action name="actionUndo">
diff --git a/forms/tileseteditor.ui b/forms/tileseteditor.ui
index 1ff9d0fb..d1817859 100644
--- a/forms/tileseteditor.ui
+++ b/forms/tileseteditor.ui
@@ -633,32 +633,36 @@
     </property>
     <addaction name="actionSave_Tileset"/>
     <addaction name="separator"/>
-   </widget>
-   <widget class="QMenu" name="menuTools">
-    <property name="title">
-     <string>Tools</string>
-    </property>
     <addaction name="actionImport_Primary_Tiles"/>
     <addaction name="actionImport_Secondary_Tiles"/>
+    <addaction name="separator"/>
     <addaction name="actionImport_Primary_Metatiles"/>
     <addaction name="actionImport_Secondary_Metatiles"/>
-    <addaction name="actionChange_Metatiles_Count"/>
-    <addaction name="actionChange_Palettes"/>
     <addaction name="separator"/>
     <addaction name="actionExport_Primary_Tiles_Image"/>
     <addaction name="actionExport_Secondary_Tiles_Image"/>
     <addaction name="actionExport_Primary_Metatiles_Image"/>
     <addaction name="actionExport_Secondary_Metatiles_Image"/>
    </widget>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>Tools</string>
+    </property>
+    <addaction name="actionChange_Palettes"/>
+    <addaction name="separator"/>
+   </widget>
    <widget class="QMenu" name="menuEdit">
     <property name="title">
      <string>Edit</string>
     </property>
+    <addaction name="actionUndo"/>
+    <addaction name="actionRedo"/>
+    <addaction name="separator"/>
     <addaction name="actionCut"/>
     <addaction name="actionCopy"/>
     <addaction name="actionPaste"/>
-    <addaction name="actionUndo"/>
-    <addaction name="actionRedo"/>
+    <addaction name="separator"/>
+    <addaction name="actionChange_Metatiles_Count"/>
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">