diff --git a/plugins/builtin/romfs/lang/de_DE.json b/plugins/builtin/romfs/lang/de_DE.json
index 82b6cb647..9308dd843 100644
--- a/plugins/builtin/romfs/lang/de_DE.json
+++ b/plugins/builtin/romfs/lang/de_DE.json
@@ -794,7 +794,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "Speichern",
         "hex.builtin.view.hex_editor.menu.file.save_as": "Speichern unter...",
         "hex.builtin.view.hex_editor.menu.file.search": "Suchen",
-        "hex.builtin.view.hex_editor.menu.file.select": "Auswählen",
+        "hex.builtin.view.hex_editor.menu.edit.select": "Auswählen",
         "hex.builtin.view.hex_editor.name": "Hex Editor",
         "hex.builtin.view.hex_editor.search.find": "Suchen",
         "hex.builtin.view.hex_editor.search.hex": "Hex",
@@ -832,7 +832,7 @@
         "hex.builtin.view.highlight_rules.config": "Konfiguration",
         "hex.builtin.view.highlight_rules.expression": "Ausdruck",
         "hex.builtin.view.highlight_rules.help_text": "Gib einen Mathematischen ausdruck ein, welcher für jedes Byte evaluiert wird. Wenn der Ausdruck wahr ist, wird das Byte markiert.",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "Highlight Regeln bearbeiten...",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "Highlighting Regeln...",
         "hex.builtin.view.highlight_rules.name": "Highlight Regeln",
         "hex.builtin.view.highlight_rules.new_rule": "Neue Regel",
         "hex.builtin.view.highlight_rules.no_rule": "Erstelle eine neue Regel um sie zu bearbeiten.",
diff --git a/plugins/builtin/romfs/lang/en_US.json b/plugins/builtin/romfs/lang/en_US.json
index c9e0b0ec4..80b468363 100644
--- a/plugins/builtin/romfs/lang/en_US.json
+++ b/plugins/builtin/romfs/lang/en_US.json
@@ -802,7 +802,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "Save",
         "hex.builtin.view.hex_editor.menu.file.save_as": "Save As...",
         "hex.builtin.view.hex_editor.menu.file.search": "Search",
-        "hex.builtin.view.hex_editor.menu.file.select": "Select",
+        "hex.builtin.view.hex_editor.menu.edit.select": "Select",
         "hex.builtin.view.hex_editor.name": "Hex editor",
         "hex.builtin.view.hex_editor.search.find": "Find",
         "hex.builtin.view.hex_editor.search.hex": "Hex",
@@ -843,7 +843,7 @@
         "hex.builtin.view.highlight_rules.expression": "Expression",
         "hex.builtin.view.highlight_rules.help_text": "Enter a mathematical expression that will be evaluated for each byte in the file.\n\nThe expression can use the variables 'value' and 'offset'.\nIf the expression evaluates to true (result is greater than 0), the byte will be highlighted with the specified color.",
         "hex.builtin.view.highlight_rules.no_rule": "Create a rule to edit it",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "Modify highlight rules...",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "Highlighting rules...",
         "hex.builtin.view.information.analyze": "Analyze page",
         "hex.builtin.view.information.analyzing": "Analyzing...",
         "hex.builtin.information_section.magic.apple_type": "Apple Creator / Type Code",
diff --git a/plugins/builtin/romfs/lang/es_ES.json b/plugins/builtin/romfs/lang/es_ES.json
index 52499b545..09dee4ea7 100644
--- a/plugins/builtin/romfs/lang/es_ES.json
+++ b/plugins/builtin/romfs/lang/es_ES.json
@@ -790,7 +790,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "Guardar",
         "hex.builtin.view.hex_editor.menu.file.save_as": "Guardar como...",
         "hex.builtin.view.hex_editor.menu.file.search": "Buscar",
-        "hex.builtin.view.hex_editor.menu.file.select": "Seleccionar",
+        "hex.builtin.view.hex_editor.menu.edit.select": "Seleccionar",
         "hex.builtin.view.hex_editor.name": "Editor hexadecimal",
         "hex.builtin.view.hex_editor.search.find": "Buscar",
         "hex.builtin.view.hex_editor.search.hex": "Hexadecimal",
@@ -828,7 +828,7 @@
         "hex.builtin.view.highlight_rules.config": "",
         "hex.builtin.view.highlight_rules.expression": "",
         "hex.builtin.view.highlight_rules.help_text": "",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "",
         "hex.builtin.view.highlight_rules.name": "",
         "hex.builtin.view.highlight_rules.new_rule": "",
         "hex.builtin.view.highlight_rules.no_rule": "",
diff --git a/plugins/builtin/romfs/lang/hu_HU.json b/plugins/builtin/romfs/lang/hu_HU.json
index 9e2a008ba..644552553 100644
--- a/plugins/builtin/romfs/lang/hu_HU.json
+++ b/plugins/builtin/romfs/lang/hu_HU.json
@@ -791,7 +791,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "Mentés",
         "hex.builtin.view.hex_editor.menu.file.save_as": "Mentés másként...",
         "hex.builtin.view.hex_editor.menu.file.search": "Keresés",
-        "hex.builtin.view.hex_editor.menu.file.select": "Kijelölés",
+        "hex.builtin.view.hex_editor.menu.edit.select": "Kijelölés",
         "hex.builtin.view.hex_editor.name": "Hex szerkesztő",
         "hex.builtin.view.hex_editor.search.find": "Kereső",
         "hex.builtin.view.hex_editor.search.hex": "Hex",
@@ -832,7 +832,7 @@
         "hex.builtin.view.highlight_rules.expression": "Kifejezés",
         "hex.builtin.view.highlight_rules.help_text": "Adj meg egy matematikai kifejezést, ami a fájl minden egyes bájtjára kiértékelődik.\n\nA kifejezés használhatja a 'value' és 'offset' változókat. Ha a kifejezés igazra értékelődik (az eredmény nagyobb mint 0), a bájt a megadott színnel lesz kiemelve.",
         "hex.builtin.view.highlight_rules.no_rule": "Hozz létre egy szabályt a szerkesztéséhez",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "Kiemelési szabályok módosítása...",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "Kiemelési szabályok módosítása...",
         "hex.builtin.view.information.analyze": "Lap elemzése",
         "hex.builtin.view.information.analyzing": "Elemzés...",
         "hex.builtin.information_section.magic.apple_type": "Apple Creator / Type Code",
diff --git a/plugins/builtin/romfs/lang/it_IT.json b/plugins/builtin/romfs/lang/it_IT.json
index 702a3d8f4..55777ebe2 100644
--- a/plugins/builtin/romfs/lang/it_IT.json
+++ b/plugins/builtin/romfs/lang/it_IT.json
@@ -790,7 +790,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "Salva",
         "hex.builtin.view.hex_editor.menu.file.save_as": "Salva come...",
         "hex.builtin.view.hex_editor.menu.file.search": "Cerca",
-        "hex.builtin.view.hex_editor.menu.file.select": "",
+        "hex.builtin.view.hex_editor.menu.edit.select": "",
         "hex.builtin.view.hex_editor.name": "Hex editor",
         "hex.builtin.view.hex_editor.search.find": "Cerca",
         "hex.builtin.view.hex_editor.search.hex": "Hex",
@@ -828,7 +828,7 @@
         "hex.builtin.view.highlight_rules.config": "",
         "hex.builtin.view.highlight_rules.expression": "",
         "hex.builtin.view.highlight_rules.help_text": "",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "",
         "hex.builtin.view.highlight_rules.name": "",
         "hex.builtin.view.highlight_rules.new_rule": "",
         "hex.builtin.view.highlight_rules.no_rule": "",
diff --git a/plugins/builtin/romfs/lang/ja_JP.json b/plugins/builtin/romfs/lang/ja_JP.json
index 4fbc7443d..92c6722dd 100644
--- a/plugins/builtin/romfs/lang/ja_JP.json
+++ b/plugins/builtin/romfs/lang/ja_JP.json
@@ -790,7 +790,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "保存",
         "hex.builtin.view.hex_editor.menu.file.save_as": "名前をつけて保存…",
         "hex.builtin.view.hex_editor.menu.file.search": "検索",
-        "hex.builtin.view.hex_editor.menu.file.select": "選択",
+        "hex.builtin.view.hex_editor.menu.edit.select": "選択",
         "hex.builtin.view.hex_editor.name": "Hexエディタ",
         "hex.builtin.view.hex_editor.search.find": "検索",
         "hex.builtin.view.hex_editor.search.hex": "16進数",
@@ -828,7 +828,7 @@
         "hex.builtin.view.highlight_rules.config": "",
         "hex.builtin.view.highlight_rules.expression": "",
         "hex.builtin.view.highlight_rules.help_text": "",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "",
         "hex.builtin.view.highlight_rules.name": "",
         "hex.builtin.view.highlight_rules.new_rule": "",
         "hex.builtin.view.highlight_rules.no_rule": "",
diff --git a/plugins/builtin/romfs/lang/ko_KR.json b/plugins/builtin/romfs/lang/ko_KR.json
index 97ee979c8..c201ab4a5 100644
--- a/plugins/builtin/romfs/lang/ko_KR.json
+++ b/plugins/builtin/romfs/lang/ko_KR.json
@@ -790,7 +790,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "저장",
         "hex.builtin.view.hex_editor.menu.file.save_as": "다른 이름으로 저장...",
         "hex.builtin.view.hex_editor.menu.file.search": "검색",
-        "hex.builtin.view.hex_editor.menu.file.select": "선택",
+        "hex.builtin.view.hex_editor.menu.edit.select": "선택",
         "hex.builtin.view.hex_editor.name": "헥스 편집기",
         "hex.builtin.view.hex_editor.search.find": "찾기",
         "hex.builtin.view.hex_editor.search.hex": "헥스",
@@ -828,7 +828,7 @@
         "hex.builtin.view.highlight_rules.config": "구성",
         "hex.builtin.view.highlight_rules.expression": "표현식",
         "hex.builtin.view.highlight_rules.help_text": "파일의 각 바이트에 대해 판단할 수학 표현식을 입력합니다.\n\n표현식에는 '값' 및 '오프셋' 변수를 사용할 수 있습니다.\n표현식이 참으로 판단되면(결과가 0보다 크면) 해당 바이트가 지정 색상으로 강조 표시됩니다.",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "강조 규칙 수정...",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "강조 규칙 수정...",
         "hex.builtin.view.highlight_rules.name": "강조 규칙",
         "hex.builtin.view.highlight_rules.new_rule": "새 규칙",
         "hex.builtin.view.highlight_rules.no_rule": "규칙을 만들어 편집하세요",
diff --git a/plugins/builtin/romfs/lang/pt_BR.json b/plugins/builtin/romfs/lang/pt_BR.json
index 71df513a2..ce60ad38f 100644
--- a/plugins/builtin/romfs/lang/pt_BR.json
+++ b/plugins/builtin/romfs/lang/pt_BR.json
@@ -790,7 +790,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "Salvar",
         "hex.builtin.view.hex_editor.menu.file.save_as": "Salvar como...",
         "hex.builtin.view.hex_editor.menu.file.search": "Procurar",
-        "hex.builtin.view.hex_editor.menu.file.select": "",
+        "hex.builtin.view.hex_editor.menu.edit.select": "",
         "hex.builtin.view.hex_editor.name": "Editor Hex",
         "hex.builtin.view.hex_editor.search.find": "Buscar",
         "hex.builtin.view.hex_editor.search.hex": "Hex",
@@ -828,7 +828,7 @@
         "hex.builtin.view.highlight_rules.config": "",
         "hex.builtin.view.highlight_rules.expression": "",
         "hex.builtin.view.highlight_rules.help_text": "",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "",
         "hex.builtin.view.highlight_rules.name": "",
         "hex.builtin.view.highlight_rules.new_rule": "",
         "hex.builtin.view.highlight_rules.no_rule": "",
diff --git a/plugins/builtin/romfs/lang/zh_CN.json b/plugins/builtin/romfs/lang/zh_CN.json
index 958a0d4f0..af847367f 100644
--- a/plugins/builtin/romfs/lang/zh_CN.json
+++ b/plugins/builtin/romfs/lang/zh_CN.json
@@ -834,7 +834,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "保存",
         "hex.builtin.view.hex_editor.menu.file.save_as": "另存为……",
         "hex.builtin.view.hex_editor.menu.file.search": "搜索",
-        "hex.builtin.view.hex_editor.menu.file.select": "选择",
+        "hex.builtin.view.hex_editor.menu.edit.select": "选择",
         "hex.builtin.view.hex_editor.name": "Hex 编辑器",
         "hex.builtin.view.hex_editor.search.find": "查找",
         "hex.builtin.view.hex_editor.search.hex": "Hex",
@@ -872,7 +872,7 @@
         "hex.builtin.view.highlight_rules.config": "配置",
         "hex.builtin.view.highlight_rules.expression": "表达式",
         "hex.builtin.view.highlight_rules.help_text": "输入将针对文件中的每个字节求值的数学表达式。\n\n该表达式可以使用变量“value”和“offset”。\n如果表达式求值 为 true（结果大于 0），该字节将以指定的颜色突出显示。",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "修改突出显示规则……",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "修改突出显示规则……",
         "hex.builtin.view.highlight_rules.name": "突出显示规则",
         "hex.builtin.view.highlight_rules.new_rule": "新规则",
         "hex.builtin.view.highlight_rules.no_rule": "创建一个规则来编辑它",
diff --git a/plugins/builtin/romfs/lang/zh_TW.json b/plugins/builtin/romfs/lang/zh_TW.json
index 83cffe128..e80271fa4 100644
--- a/plugins/builtin/romfs/lang/zh_TW.json
+++ b/plugins/builtin/romfs/lang/zh_TW.json
@@ -790,7 +790,7 @@
         "hex.builtin.view.hex_editor.menu.file.save": "儲存",
         "hex.builtin.view.hex_editor.menu.file.save_as": "另存為...",
         "hex.builtin.view.hex_editor.menu.file.search": "搜尋",
-        "hex.builtin.view.hex_editor.menu.file.select": "選取",
+        "hex.builtin.view.hex_editor.menu.edit.select": "選取",
         "hex.builtin.view.hex_editor.name": "十六進位編輯器",
         "hex.builtin.view.hex_editor.search.find": "尋找",
         "hex.builtin.view.hex_editor.search.hex": "十六進位",
@@ -828,7 +828,7 @@
         "hex.builtin.view.highlight_rules.config": "",
         "hex.builtin.view.highlight_rules.expression": "",
         "hex.builtin.view.highlight_rules.help_text": "",
-        "hex.builtin.view.highlight_rules.menu.edit.rules": "",
+        "hex.builtin.view.highlight_rules.menu.file.rules": "",
         "hex.builtin.view.highlight_rules.name": "",
         "hex.builtin.view.highlight_rules.new_rule": "",
         "hex.builtin.view.highlight_rules.no_rule": "",
diff --git a/plugins/builtin/source/content/views/view_hex_editor.cpp b/plugins/builtin/source/content/views/view_hex_editor.cpp
index 3a5c95e3c..15631d8ff 100644
--- a/plugins/builtin/source/content/views/view_hex_editor.cpp
+++ b/plugins/builtin/source/content/views/view_hex_editor.cpp
@@ -206,7 +206,7 @@ namespace hex::plugin::builtin {
         }
 
         [[nodiscard]] UnlocalizedString getTitle() const override {
-            return "hex.builtin.view.hex_editor.menu.file.select";
+            return "hex.builtin.view.hex_editor.menu.edit.select";
         }
 
         [[nodiscard]] bool canBePinned() const override {
@@ -1085,15 +1085,6 @@ namespace hex::plugin::builtin {
                                                 },
                                                 ImHexApi::Provider::isValid);
 
-        /* Select */
-        ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.file", "hex.builtin.view.hex_editor.menu.file.select" }, ICON_VS_SELECTION, 1650,
-                                                CTRLCMD + SHIFT + Keys::A,
-                                                [this] {
-                                                    auto selection = ImHexApi::HexEditor::getSelection().value_or(ImHexApi::HexEditor::ProviderRegion{ { 0, 1 }, nullptr });
-                                                    this->openPopup<PopupSelect>(selection.getStartAddress(), selection.getSize());
-                                                },
-                                                ImHexApi::Provider::isValid);
-
 
 
         ContentRegistry::Interface::addMenuItemSeparator({ "hex.builtin.menu.edit" }, 1100);
@@ -1185,8 +1176,17 @@ namespace hex::plugin::builtin {
                                                 ImHexApi::HexEditor::isSelectionValid,
                                                 this);
 
+        /* Select */
+        ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.edit", "hex.builtin.view.hex_editor.menu.edit.select" }, ICON_VS_SELECTION, 1525,
+                                                CTRLCMD + SHIFT + Keys::A,
+                                                [this] {
+                                                    auto selection = ImHexApi::HexEditor::getSelection().value_or(ImHexApi::HexEditor::ProviderRegion{ { 0, 1 }, nullptr });
+                                                    this->openPopup<PopupSelect>(selection.getStartAddress(), selection.getSize());
+                                                },
+                                                ImHexApi::Provider::isValid);
+
         /* Select All */
-        ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.edit", "hex.builtin.view.hex_editor.menu.edit.select_all" }, ICON_VS_SELECTION, 1550, CurrentView + CTRLCMD + Keys::A,
+        ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.edit", "hex.builtin.view.hex_editor.menu.edit.select_all" }, ICON_VS_LIST_FLAT, 1550, CurrentView + CTRLCMD + Keys::A,
                                                 [] {
                                                     auto provider = ImHexApi::Provider::get();
                                                     ImHexApi::HexEditor::setSelection(provider->getBaseAddress(), provider->getActualSize());
diff --git a/plugins/builtin/source/content/views/view_highlight_rules.cpp b/plugins/builtin/source/content/views/view_highlight_rules.cpp
index 745827614..2fcaf38ff 100644
--- a/plugins/builtin/source/content/views/view_highlight_rules.cpp
+++ b/plugins/builtin/source/content/views/view_highlight_rules.cpp
@@ -110,7 +110,7 @@ namespace hex::plugin::builtin {
 
 
     ViewHighlightRules::ViewHighlightRules() : View::Floating("hex.builtin.view.highlight_rules.name") {
-        ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.edit", "hex.builtin.view.highlight_rules.menu.edit.rules" }, ICON_VS_TAG, 1870, Shortcut::None, [&, this] {
+        ContentRegistry::Interface::addMenuItem({ "hex.builtin.menu.file", "hex.builtin.view.highlight_rules.menu.file.rules" }, ICON_VS_TAG, 1650, Shortcut::None, [&, this] {
             this->getWindowOpenState() = true;
         }, ImHexApi::Provider::isValid);