diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index c44e3938b13e..4a4a56561d48 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2623,7 +2623,6 @@ _offlineScreen:
   title: "オフライン - サーバーに接続できません"
   header: "サーバーに接続できません"
 
-<<<<<<< HEAD
 _urlPreviewSetting:
   title: "URLプレビューの設定"
   enable: "URLプレビューを有効にする"
@@ -2643,7 +2642,7 @@ _mediaControls:
   pip: "ピクチャインピクチャ"
   playbackRate: "再生速度"
   loop: "ループ再生"
-=======
+
 _hideReactionCount:
   none: "非表示にしない"
   self: "自分のノートのみ"
@@ -2653,4 +2652,3 @@ _hideReactionCount:
 _draftSavingBehavior:
   auto: "自動的に保存する"
   manual: "都度確認する"
->>>>>>> 03d1c493a2 (feat: 下書き機能 (#144))
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index ba282184d16a..4ec46ec3bf64 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -87,6 +87,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<button v-tooltip="i18n.ts.hashtags" class="_button" :class="[$style.footerButton, { [$style.footerButtonActive]: withHashtags }]" @click="withHashtags = !withHashtags"><i class="ti ti-hash"></i></button>
 			<button v-if="postFormActions.length > 0" v-tooltip="i18n.ts.plugins" class="_button" :class="$style.footerButton" @click="showActions"><i class="ti ti-plug"></i></button>
 			<button v-tooltip="i18n.ts.emoji" :class="['_button', $style.footerButton]" @click="insertEmoji"><i class="ti ti-mood-happy"></i></button>
+			<button v-tooltip="i18n.ts.saveAsDraft" :class="['_button', $style.footerButton]" @click="saveDraft(false)"><i class="ti ti-note"></i></button>
 			<button v-if="showAddMfmFunction" v-tooltip="i18n.ts.addMfmFunction" :class="['_button', $style.footerButton]" @click="insertMfmFunction"><i class="ti ti-palette"></i></button>
 		</div>
 		<div :class="$style.footerRight">
@@ -260,7 +261,6 @@ const canPost = computed((): boolean => {
 			props.renote != null ||
 			(props.reply != null && quoteId.value != null)
 		) &&
-		(scheduledNoteDelete.value ? scheduledNoteDelete.value.isValid : true) &&
 		(1 <= textLength.value || 1 <= files.value.length || !!poll.value || !!renote.value) &&
 		(textLength.value <= maxTextLength.value) &&
 		(!poll.value || poll.value.choices.length >= 2);
@@ -269,53 +269,6 @@ const canPost = computed((): boolean => {
 const withHashtags = computed(defaultStore.makeGetterSetter('postFormWithHashtags'));
 const hashtags = computed(defaultStore.makeGetterSetter('postFormHashtags'));
 
-const bottomItemActionDef: Record<keyof typeof bottomItemDef, {
-	hide?: boolean;
-	active?: any;
-	action?: any;
-}> = reactive({
-	attachFile: {
-		action: chooseFileFrom,
-	},
-	poll: {
-		active: poll,
-		action: togglePoll,
-	},
-	scheduledNoteDelete: {
-		active: scheduledNoteDelete,
-		action: toggleScheduledNoteDelete,
-	},
-	useCw: {
-		active: useCw,
-		action: () => useCw.value = !useCw.value,
-	},
-	mention: {
-		action: insertMention,
-	},
-	hashtags: {
-		active: withHashtags,
-		action: () => withHashtags.value = !withHashtags.value,
-	},
-	plugins: {
-		hide: postFormActions.length === 0,
-		action: showActions,
-	},
-	emoji: {
-		action: insertEmoji,
-	},
-	addMfmFunction: {
-		hide: computed(() => !showAddMfmFunction.value),
-		action: insertMfmFunction,
-	},
-	clearPost: {
-		action: clear,
-	},
-	saveAsDraft: {
-		action: () => saveDraft(false),
-	},
-});
-
->>>>>>> 03d1c493a2 (feat: 下書き機能 (#144))
 watch(text, () => {
 	checkMissingMention();
 }, { immediate: true });
@@ -723,7 +676,7 @@ function onDrop(ev: DragEvent): void {
 async function saveDraft(auto = true) {
 	if (props.instant || props.mock) return;
 
-	if (auto && defaultStore.state.draftSavingBehavior !== 'auto') return;
+	if (auto) return;
 
 	if (!auto) {
 		// 手動での保存の場合は自動保存したものを削除した上で保存
@@ -738,7 +691,6 @@ async function saveDraft(auto = true) {
 		localOnly: localOnly.value,
 		files: files.value,
 		poll: poll.value,
-		scheduledNoteDelete: scheduledNoteDelete.value,
 	}, draftAuxId.value as string);
 
 	if (!auto) {
@@ -801,9 +753,6 @@ async function applyDraft(draft: noteDrafts.NoteDraft, native = false) {
 	if (draft.data.poll) {
 		poll.value = draft.data.poll;
 	}
-	if (draft.data.scheduledNoteDelete) {
-		scheduledNoteDelete.value = draft.data.scheduledNoteDelete;
-	}
 }
 
 async function post(ev?: MouseEvent) {
@@ -980,14 +929,8 @@ function cancel() {
 }
 
 async function closed() {
-	if (defaultStore.state.draftSavingBehavior === 'manual' && (text.value !== '' || files.value.length > 0)) {
-		os.confirm({
-			type: 'question',
-			text: i18n.ts.saveConfirm,
-		}).then(({ canceled }) => {
-			if (canceled) return;
-			saveDraft(false);
-		});
+	if (text.value !== '' || files.value.length > 0) {
+		return;
 	}
 }
 
diff --git a/packages/frontend/src/pages/settings/post-form.vue b/packages/frontend/src/pages/settings/post-form.vue
deleted file mode 100644
index 4a04583b626b..000000000000
--- a/packages/frontend/src/pages/settings/post-form.vue
+++ /dev/null
@@ -1,154 +0,0 @@
-<template>
-<div class="_gaps_m">
-	<FormSlot>
-		<template #label>{{ i18n.ts.postForm }}<span class="_beta">{{ i18n.ts.originalFeature }}</span></template>
-		<MkContainer :showHeader="false">
-			<Sortable
-				v-model="items"
-				:class="$style.items"
-				:itemKey="items => items"
-				:animation="100"
-				:delay="50"
-				:delayOnTouchOnly="true"
-			>
-				<template #item="{element}">
-					<button v-tooltip="bottomItemDef[element.type].title" class="_button" :class="$style.item" @click="removeItem(element.type, $event)">
-						<i class="ti ti-fw" :class="[$style.itemIcon, bottomItemDef[element.type].icon]"></i>
-					</button>
-				</template>
-			</Sortable>
-		</MkContainer>
-	</FormSlot>
-	<div class="_buttons">
-		<MkButton @click="addItem"><i class="ti ti-plus"></i> {{ i18n.ts.addItem }}</MkButton>
-		<MkButton danger @click="reset"><i class="ti ti-reload"></i> {{ i18n.ts.default }}</MkButton>
-		<MkButton primary class="save" @click="save"><i class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton>
-	</div>
-	<div :class="$style.label">{{ i18n.ts.postFormBottomSettingsDescription }}</div>
-	<MkSelect v-model="draftSavingBehavior">
-		<template #label>{{ i18n.ts.draftSavingBehavior }}<span class="_beta">{{ i18n.ts.originalFeature }}</span></template>
-		<option value="auto">{{ i18n.ts._draftSavingBehavior.auto }}</option>
-		<option value="manual">{{ i18n.ts._draftSavingBehavior.manual }}</option>
-	</MkSelect>
-	<MkSwitch v-model="disableNoteDrafting">
-		<template #caption>{{ i18n.ts.disableNoteDraftingDescription }}</template>
-		{{ i18n.ts.disableNoteDrafting }}
-		<span class="_beta">{{ i18n.ts.originalFeature }}</span>
-	</MkSwitch>
-</div>
-</template>
-
-<script lang="ts" setup>
-import { computed, defineAsyncComponent, ref } from 'vue';
-import MkButton from '@/components/MkButton.vue';
-import MkSwitch from '@/components/MkSwitch.vue';
-import MkSelect from '@/components/MkSelect.vue';
-import FormSlot from '@/components/form/slot.vue';
-import MkContainer from '@/components/MkContainer.vue';
-import { bottomItemDef } from '@/scripts/post-form.js';
-import * as os from '@/os.js';
-import { defaultStore } from '@/store.js';
-import { i18n } from '@/i18n.js';
-import { definePageMetadata } from '@/scripts/page-metadata.js';
-
-const disableNoteDrafting = computed(defaultStore.makeGetterSetter('disableNoteDrafting'));
-const draftSavingBehavior = computed(defaultStore.makeGetterSetter('draftSavingBehavior'));
-
-const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
-
-const items = ref(defaultStore.state.postFormActions.map(x => ({
-	id: Math.random().toString(),
-	type: x,
-})));
-
-async function addItem() {
-	const currentItems = items.value.map(x => x.type);
-	const bottomItem = Object.keys(bottomItemDef).filter(k => !currentItems.includes(k));
-	const { canceled, result: item } = await os.select({
-		title: i18n.ts.addItem,
-		items: bottomItem.map(k => ({
-			value: k, text: bottomItemDef[k].title,
-		})),
-	});
-	if (canceled || item == null) return;
-	items.value = [...items.value, {
-		id: Math.random().toString(),
-		type: item,
-	}];
-}
-
-function getHTMLElement(ev: MouseEvent): HTMLElement {
-	const target = ev.currentTarget ?? ev.target;
-	return target as HTMLElement;
-}
-
-function removeItem(type: keyof typeof bottomItemDef, ev: MouseEvent) {
-	const item = bottomItemDef[type];
-	os.popupMenu([{
-		type: 'label',
-		text: item.title,
-	}, {
-		text: i18n.ts.remove,
-		action: () => {
-			items.value = items.value.filter(x => x.type !== type);
-		},
-	}], getHTMLElement(ev));
-}
-
-async function save() {
-	defaultStore.set('postFormActions', items.value.map(x => x.type));
-}
-
-async function reset() {
-	const result = await os.confirm({
-		type: 'warning',
-		text: i18n.ts.resetAreYouSure,
-	});
-	if (result.canceled) return;
-
-	items.value = defaultStore.def.postFormActions.default.map(x => ({
-		id: Math.random().toString(),
-		type: x,
-	}));
-}
-
-const headerActions = computed(() => []);
-
-const headerTabs = computed(() => []);
-
-definePageMetadata(() => ({
-	title: i18n.ts.postForm,
-	icon: 'ti ti-pencil',
-}));
-</script>
-
-<style lang="scss" module>
-.items {
-	padding: 8px;
-	flex: 1;
-	display: grid;
-	grid-auto-flow: row;
-	grid-template-columns: repeat(auto-fill, minmax(42px, 1fr));
-	grid-auto-rows: 40px;
-}
-
-.item {
-	display: inline-block;
-	padding: 0;
-	margin: 0;
-	font-size: 1em;
-	width: auto;
-	height: 100%;
-	border-radius: 6px;
-
-	&:hover {
-		background: var(--X5);
-	}
-}
-
-.label {
-	font-size: 0.85em;
-	padding: 0 0 8px 0;
-	user-select: none;
-}
-</style>
diff --git a/packages/frontend/src/scripts/note-drafts.ts b/packages/frontend/src/scripts/note-drafts.ts
index 67abc004a3ca..203f5a14c28f 100644
--- a/packages/frontend/src/scripts/note-drafts.ts
+++ b/packages/frontend/src/scripts/note-drafts.ts
@@ -17,7 +17,6 @@ export type NoteDraft = {
 		localOnly: boolean;
 		files: Misskey.entities.DriveFile[];
 		poll: PollEditorModelValue | null;
-		scheduledNoteDelete: DeleteScheduleEditorModelValue | null;
 	};
 };
 
diff --git a/packages/frontend/src/scripts/post-form.ts b/packages/frontend/src/scripts/post-form.ts
index 40c63acb393d..4ad753566f76 100644
--- a/packages/frontend/src/scripts/post-form.ts
+++ b/packages/frontend/src/scripts/post-form.ts
@@ -9,10 +9,6 @@ export const bottomItemDef = {
 		title: i18n.ts.poll,
 		icon: 'ti-chart-arrows',
 	},
-	scheduledNoteDelete: {
-		title: i18n.ts.scheduledNoteDelete,
-		icon: 'ti-bomb',
-	},
 	useCw: {
 		title: i18n.ts.useCw,
 		icon: 'ti-eye-off',