diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.impl.ts b/packages/frontend/src/pages/admin/custom-emojis-manager.impl.ts
similarity index 100%
rename from packages/frontend/src/pages/admin/custom-emojis-grid.impl.ts
rename to packages/frontend/src/pages/admin/custom-emojis-manager.impl.ts
diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
similarity index 99%
rename from packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue
rename to packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
index 8d4bd7d3cc..f580a6c06b 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-grid.local.list.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
@@ -142,7 +142,7 @@ import {
 	emptyStrToNull,
 	emptyStrToUndefined,
 	RequestLogItem,
-} from '@/pages/admin/custom-emojis-grid.impl.js';
+} from '@/pages/admin/custom-emojis-manager.impl.js';
 import MkGrid from '@/components/grid/MkGrid.vue';
 import { i18n } from '@/i18n.js';
 import MkInput from '@/components/MkInput.vue';
@@ -158,7 +158,7 @@ import {
 import { optInGridUtils } from '@/components/grid/optin-utils.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import MkPagingButtons from '@/components/MkPagingButtons.vue';
-import XRegisterLogs from '@/pages/admin/custom-emojis-grid.local.logs.vue';
+import XRegisterLogs from '@/pages/admin/custom-emojis-manager.local.logs.vue';
 import MkFolder from '@/components/MkFolder.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import { deviceKind } from '@/scripts/device-kind.js';
diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.local.logs.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.logs.vue
similarity index 97%
rename from packages/frontend/src/pages/admin/custom-emojis-grid.local.logs.vue
rename to packages/frontend/src/pages/admin/custom-emojis-manager.local.logs.vue
index 28377dbe88..bed2002ae2 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-grid.local.logs.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.logs.vue
@@ -26,7 +26,7 @@
 <script setup lang="ts">
 
 import { computed, ref, toRefs } from 'vue';
-import { RequestLogItem } from '@/pages/admin/custom-emojis-grid.impl.js';
+import { RequestLogItem } from '@/pages/admin/custom-emojis-manager.impl.js';
 import {
 	GridContext,
 	GridEvent,
diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.local.register.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.register.vue
similarity index 99%
rename from packages/frontend/src/pages/admin/custom-emojis-grid.local.register.vue
rename to packages/frontend/src/pages/admin/custom-emojis-manager.local.register.vue
index 07c44326bc..a1690645ab 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-grid.local.register.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.register.vue
@@ -75,7 +75,7 @@
 import * as Misskey from 'misskey-js';
 import { onMounted, ref } from 'vue';
 import { misskeyApi } from '@/scripts/misskey-api.js';
-import { emptyStrToEmptyArray, emptyStrToNull, RequestLogItem } from '@/pages/admin/custom-emojis-grid.impl.js';
+import { emptyStrToEmptyArray, emptyStrToNull, RequestLogItem } from '@/pages/admin/custom-emojis-manager.impl.js';
 import MkGrid from '@/components/grid/MkGrid.vue';
 import { i18n } from '@/i18n.js';
 import MkSelect from '@/components/MkSelect.vue';
@@ -96,7 +96,7 @@ import {
 } from '@/components/grid/grid-event.js';
 import { DroppedFile, extractDroppedItems, flattenDroppedFiles } from '@/scripts/file-drop.js';
 import { optInGridUtils } from '@/components/grid/optin-utils.js';
-import XRegisterLogs from '@/pages/admin/custom-emojis-grid.local.logs.vue';
+import XRegisterLogs from '@/pages/admin/custom-emojis-manager.local.logs.vue';
 import { GridSetting } from '@/components/grid/grid.js';
 
 const MAXIMUM_EMOJI_REGISTER_COUNT = 100;
diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.local.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.vue
similarity index 83%
rename from packages/frontend/src/pages/admin/custom-emojis-grid.local.vue
rename to packages/frontend/src/pages/admin/custom-emojis-manager.local.vue
index de92f1437a..830877cb83 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-grid.local.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.vue
@@ -15,8 +15,8 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import MkTab from '@/components/MkTab.vue';
-import XListComponent from '@/pages/admin/custom-emojis-grid.local.list.vue';
-import XRegisterComponent from '@/pages/admin/custom-emojis-grid.local.register.vue';
+import XListComponent from '@/pages/admin/custom-emojis-manager.local.list.vue';
+import XRegisterComponent from '@/pages/admin/custom-emojis-manager.local.register.vue';
 
 type PageMode = 'list' | 'register';
 
diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.remote.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue
similarity index 96%
rename from packages/frontend/src/pages/admin/custom-emojis-grid.remote.vue
rename to packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue
index 18e217d4b5..792581a046 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-grid.remote.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.remote.vue
@@ -3,11 +3,11 @@
 	<div :class="$style.searchArea">
 		<MkInput v-model="query" :debounce="true" type="search" autocapitalize="off" style="flex: 1">
 			<template #prefix><i class="ti ti-search"></i></template>
-			<template #label>絵文字名</template>
+			<template #label>name</template>
 		</MkInput>
 		<MkInput v-model="host" :debounce="true" type="search" autocapitalize="off" style="flex: 1">
 			<template #prefix><i class="ti ti-cloud-network"></i></template>
-			<template #label>ホスト名</template>
+			<template #label>host</template>
 		</MkInput>
 		<MkButton primary style="margin-left: auto;" @click="onSearchButtonClicked">
 			{{ i18n.ts.search }}
@@ -51,11 +51,11 @@ import { i18n } from '@/i18n.js';
 import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkGrid from '@/components/grid/MkGrid.vue';
-import { RequestLogItem } from '@/pages/admin/custom-emojis-grid.impl.js';
+import { RequestLogItem } from '@/pages/admin/custom-emojis-manager.impl.js';
 import { GridCellValueChangeEvent, GridContext, GridEvent, GridKeyDownEvent } from '@/components/grid/grid-event.js';
 import { optInGridUtils } from '@/components/grid/optin-utils.js';
 import MkFolder from '@/components/MkFolder.vue';
-import XRegisterLogs from '@/pages/admin/custom-emojis-grid.local.logs.vue';
+import XRegisterLogs from '@/pages/admin/custom-emojis-manager.local.logs.vue';
 import * as os from '@/os.js';
 import { GridSetting } from '@/components/grid/grid.js';
 
diff --git a/packages/frontend/src/pages/admin/custom-emojis-grid.vue b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
similarity index 87%
rename from packages/frontend/src/pages/admin/custom-emojis-grid.vue
rename to packages/frontend/src/pages/admin/custom-emojis-manager2.vue
index 7e057fc5da..66d6f8c23c 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-grid.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager2.vue
@@ -14,8 +14,8 @@
 import { computed, ref } from 'vue';
 import { i18n } from '@/i18n.js';
 import { definePageMetadata } from '@/scripts/page-metadata.js';
-import XGridLocalComponent from '@/pages/admin/custom-emojis-grid.local.vue';
-import XGridRemoteComponent from '@/pages/admin/custom-emojis-grid.remote.vue';
+import XGridLocalComponent from '@/pages/admin/custom-emojis-manager.local.vue';
+import XGridRemoteComponent from '@/pages/admin/custom-emojis-manager.remote.vue';
 import MkPageHeader from '@/components/global/MkPageHeader.vue';
 import MkStickyContainer from '@/components/global/MkStickyContainer.vue';
 
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index d4a41c66cc..d5ab3225c2 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -116,6 +116,11 @@ const menuDef = computed(() => [{
 		text: i18n.ts.customEmojis,
 		to: '/admin/emojis',
 		active: currentPage.value?.route.name === 'emojis',
+	}, {
+		icon: 'ti ti-icons',
+		text: i18n.ts.customEmojis + '(beta)',
+		to: '/admin/emojis2',
+		active: currentPage.value?.route.name === 'emojis2',
 	}, {
 		icon: 'ti ti-sparkles',
 		text: i18n.ts.avatarDecorations,
diff --git a/packages/frontend/src/router/definition.ts b/packages/frontend/src/router/definition.ts
index 0160610fb5..a71732d2fa 100644
--- a/packages/frontend/src/router/definition.ts
+++ b/packages/frontend/src/router/definition.ts
@@ -20,10 +20,6 @@ const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({
 const routes: RouteDef[] = [{
 	path: '/@:initUser/pages/:initPageName/view-source',
 	component: page(() => import('@/pages/page-editor/page-editor.vue')),
-}, {
-	path: '/emojis2',
-	name: 'emojis2',
-	component: page(() => import('@/pages/admin/custom-emojis-grid.vue')),
 }, {
 	path: '/@:username/pages/:pageName',
 	component: page(() => import('@/pages/page.vue')),
@@ -368,7 +364,7 @@ const routes: RouteDef[] = [{
 	}, {
 		path: '/emojis2',
 		name: 'emojis2',
-		component: page(() => import('@/pages/admin/custom-emojis-grid.vue')),
+		component: page(() => import('@/pages/admin/custom-emojis-manager2.vue')),
 	}, {
 		path: '/avatar-decorations',
 		name: 'avatarDecorations',