diff --git a/packages/client/src/components/MkNotificationSettingWindow.vue b/packages/client/src/components/MkNotificationSettingWindow.vue
index 1b6ca7082..39f6b9e09 100644
--- a/packages/client/src/components/MkNotificationSettingWindow.vue
+++ b/packages/client/src/components/MkNotificationSettingWindow.vue
@@ -19,8 +19,8 @@
 					}}</template>
 				</MkSwitch>
 			</div>
-			<div v-if="!useGlobalSetting" class="_section">
-				<MkInfo>{{ i18n.ts.notificationSettingDesc }}</MkInfo>
+			<div v-if="!useGlobalSetting" class="_section _formRoot">
+				<MkInfo class="_formBlock">{{ i18n.ts.notificationSettingDesc }}</MkInfo>
 				<MkButton inline @click="disableAll">{{
 					i18n.ts.disableAll
 				}}</MkButton>
@@ -29,6 +29,7 @@
 				}}</MkButton>
 				<MkSwitch
 					v-for="ntype in notificationTypes"
+					class="_formBlock"
 					:key="ntype"
 					v-model="typesMap[ntype]"
 					>{{ i18n.t(`_notification._types.${ntype}`) }}</MkSwitch
diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue
index a54f8830f..9ea38670c 100644
--- a/packages/client/src/components/form/textarea.vue
+++ b/packages/client/src/components/form/textarea.vue
@@ -1,9 +1,9 @@
 <template>
 	<div class="adhpbeos">
 		<label>
-			<span class="label">
+			<div class="label">
 				<slot name="label"></slot>
-			</span>
+			</div>
 			<div class="input" :class="{ disabled, focused, tall, pre }">
 				<textarea
 					ref="inputEl"
diff --git a/packages/client/src/pages/gallery/edit.vue b/packages/client/src/pages/gallery/edit.vue
index 72da912ea..f3b0627ba 100644
--- a/packages/client/src/pages/gallery/edit.vue
+++ b/packages/client/src/pages/gallery/edit.vue
@@ -4,20 +4,20 @@
 			><MkPageHeader :actions="headerActions" :tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="800" :margin-min="16" :margin-max="32">
-			<FormSuspense :p="init">
-				<FormInput v-model="title">
+			<FormSuspense :p="init" class="_formRoot">
+				<FormInput v-model="title" class="_formBlock">
 					<template #label>{{ i18n.ts.title }}</template>
 				</FormInput>
 
-				<FormTextarea v-model="description" :max="500">
+				<FormTextarea v-model="description" :max="500" class="_formBlock">
 					<template #label>{{ i18n.ts.description }}</template>
 				</FormTextarea>
 
-				<div class="">
+				<div class="_formBlock">
 					<div
 						v-for="file in files"
 						:key="file.id"
-						class="wqugxsfx"
+						class="wqugxsfx _formBlock"
 						:style="{
 							backgroundImage: file
 								? `url(${file.thumbnailUrl})`
@@ -40,20 +40,20 @@
 					>
 				</div>
 
-				<FormSwitch v-model="isSensitive">{{
+				<FormSwitch v-model="isSensitive" class="_formBlock">{{
 					i18n.ts.markAsSensitive
 				}}</FormSwitch>
 
-				<FormButton v-if="postId" primary @click="save"
+				<FormButton v-if="postId" primary @click="save" class="_formBlock"
 					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
 					{{ i18n.ts.save }}</FormButton
 				>
-				<FormButton v-else primary @click="save"
+				<FormButton v-else primary @click="save" class="_formBlock"
 					><i class="ph-floppy-disk-back ph-bold ph-lg"></i>
 					{{ i18n.ts.publish }}</FormButton
 				>
 
-				<FormButton v-if="postId" danger @click="del"
+				<FormButton v-if="postId" danger @click="del" class="_formBlock"
 					><i class="ph-trash ph-bold ph-lg"></i>
 					{{ i18n.ts.delete }}</FormButton
 				>