diff --git a/src/client/components/user-select-dialog.vue b/src/client/components/user-select-dialog.vue
index 8e7b0a190c..87c32dab25 100644
--- a/src/client/components/user-select-dialog.vue
+++ b/src/client/components/user-select-dialog.vue
@@ -10,7 +10,7 @@
 	<template #header>{{ $ts.selectUser }}</template>
 	<div class="tbhwbxda _monolithic_">
 		<div class="_section">
-			<div class="inputs">
+			<div class="_inputSplit _inputNoTopMargin _inputNoBottomMargin">
 				<MkInput v-model="username" class="input" @update:modelValue="search" ref="username">
 					<template #label>{{ $ts.username }}</template>
 					<template #prefix>@</template>
@@ -144,14 +144,6 @@ export default defineComponent({
 			padding: 0;
 		}
 
-		> .inputs {
-			> .input {
-				display: inline-block;
-				width: 50%;
-				margin: 0;
-			}
-		}
-
 		> .users {
 			flex: 1;
 			overflow: auto;
diff --git a/src/client/pages/docs.vue b/src/client/pages/docs.vue
index b1d3c2c7f9..48bae6c5c2 100644
--- a/src/client/pages/docs.vue
+++ b/src/client/pages/docs.vue
@@ -1,9 +1,8 @@
 <template>
 <div class="vtaihdtm">
 	<div class="search">
-		<MkInput v-model="query" :debounce="true" type="search" class="_inputNoTopMargin _inputNoBottomMargin">
+		<MkInput v-model="query" :debounce="true" type="search" class="_inputNoTopMargin _inputNoBottomMargin" :placeholder="$ts.search">
 			<template #prefix><i class="fas fa-search"></i></template>
-			<template #label>{{ $ts.search }}</template>
 		</MkInput>
 	</div>
 	<MkFolder>
diff --git a/src/client/pages/emojis.vue b/src/client/pages/emojis.vue
index c766b5f7b8..435727e196 100644
--- a/src/client/pages/emojis.vue
+++ b/src/client/pages/emojis.vue
@@ -1,9 +1,8 @@
 <template>
 <div class="driuhtrh">
 	<div class="query">
-		<MkInput v-model="q" class="_inputNoTopMargin _inputNoBottomMargin">
+		<MkInput v-model="q" class="_inputNoTopMargin _inputNoBottomMargin" :placeholder="$ts.search">
 			<template #prefix><i class="fas fa-search"></i></template>
-			<template #label>{{ $ts.search }}</template>
 		</MkInput>
 	</div>
 
@@ -102,7 +101,6 @@ export default defineComponent({
 	> .query {
 		background: var(--bg);
 		padding: 16px;
-		border-bottom: solid 0.5px var(--divider);
 	}
 
 	> .emojis {
diff --git a/src/client/pages/federation.vue b/src/client/pages/federation.vue
index 59867b8e54..4a861ac911 100644
--- a/src/client/pages/federation.vue
+++ b/src/client/pages/federation.vue
@@ -169,7 +169,6 @@ export default defineComponent({
 	> .query {
 		background: var(--bg);
 		padding: 16px;
-		border-bottom: solid 0.5px var(--divider);
 	}
 }
 
diff --git a/src/client/pages/messaging/messaging-room.vue b/src/client/pages/messaging/messaging-room.vue
index 396f5f56fd..24ed105913 100644
--- a/src/client/pages/messaging/messaging-room.vue
+++ b/src/client/pages/messaging/messaging-room.vue
@@ -29,7 +29,7 @@
 					<button class="_buttonPrimary" @click="onIndicatorClick"><i class="fas fa-arrow-circle-down"></i>{{ $ts.newMessageExists }}</button>
 				</div>
 			</transition>
-			<XForm v-if="!fetching" :user="user" :group="group" ref="form"/>
+			<XForm v-if="!fetching" :user="user" :group="group" ref="form" class="form"/>
 		</footer>
 	</div>
 </div>
@@ -452,6 +452,10 @@ export default Component;
 				}
 			}
 		}
+
+		> .form {
+			border-top: solid 0.5px var(--divider);
+		}
 	}
 }
 
diff --git a/src/client/style.scss b/src/client/style.scss
index d2a54e34b0..99c1ced049 100644
--- a/src/client/style.scss
+++ b/src/client/style.scss
@@ -403,7 +403,7 @@ hr {
 
 ._inputSplit {
 	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+	grid-template-columns: repeat(auto-fill, minmax(170px, 1fr));
 	grid-gap: 8px;
 	margin: 1em 0;
 
diff --git a/src/client/themes/_dark.json5 b/src/client/themes/_dark.json5
index a8ec67e8c7..fef8df4c7c 100644
--- a/src/client/themes/_dark.json5
+++ b/src/client/themes/_dark.json5
@@ -59,7 +59,7 @@
 		driveFolderBg: ':alpha<0.3<@accent',
 		wallpaperOverlay: 'rgba(0, 0, 0, 0.5)',
 		badge: '#31b1ce',
-		messageBg: ':lighten<5<@bg',
+		messageBg: '@bg',
 		success: '#86b300',
 		error: '#ec4137',
 		warn: '#ecb637',
diff --git a/src/client/themes/_light.json5 b/src/client/themes/_light.json5
index 0c54c704a6..b31e369a37 100644
--- a/src/client/themes/_light.json5
+++ b/src/client/themes/_light.json5
@@ -59,7 +59,7 @@
 		driveFolderBg: ':alpha<0.3<@accent',
 		wallpaperOverlay: 'rgba(255, 255, 255, 0.5)',
 		badge: '#31b1ce',
-		messageBg: '@panel',
+		messageBg: '@bg',
 		success: '#86b300',
 		error: '#ec4137',
 		warn: '#ecb637',
diff --git a/src/client/themes/d-astro.json5 b/src/client/themes/d-astro.json5
index 74b90addd5..08846dec20 100644
--- a/src/client/themes/d-astro.json5
+++ b/src/client/themes/d-astro.json5
@@ -32,7 +32,7 @@
 		cwHoverBg: '#707b97',
 		indicator: '@accent',
 		mentionMe: '#fb5d38',
-		messageBg: ':lighten<5<@bg',
+		messageBg: '@bg',
 		navActive: '@accent',
 		infoWarnBg: '#42321c',
 		infoWarnFg: '#ffbd3e',
diff --git a/src/client/themes/d-black.json5 b/src/client/themes/d-black.json5
index f4b93cdcbc..3c18ebdaf1 100644
--- a/src/client/themes/d-black.json5
+++ b/src/client/themes/d-black.json5
@@ -13,6 +13,5 @@
 		panelHeaderDivider: '@divider',
 		shadow: 'rgba(255, 255, 255, 0.05)',
 		modalBg: 'rgba(255, 255, 255, 0.1)',
-		messageBg: '#1d1d1d',
 	},
 }
diff --git a/src/client/themes/l-light.json5 b/src/client/themes/l-light.json5
index f85bee3b06..79176cdd62 100644
--- a/src/client/themes/l-light.json5
+++ b/src/client/themes/l-light.json5
@@ -15,6 +15,5 @@
 		navBg: '#fff',
 		panel: '#fff',
 		panelHeaderDivider: '@divider',
-		messageBg: '#dedede',
 	},
 }
diff --git a/src/client/themes/l-vivid.json5 b/src/client/themes/l-vivid.json5
index 9fc04cd0d3..32bb9dc26b 100644
--- a/src/client/themes/l-vivid.json5
+++ b/src/client/themes/l-vivid.json5
@@ -35,7 +35,7 @@
 		cwHoverBg: '#bbc4ce',
 		indicator: '@accent',
 		mentionMe: '@mention',
-		messageBg: '@panel',
+		messageBg: '@bg',
 		navActive: '@accent',
 		infoWarnBg: '#fff0db',
 		infoWarnFg: '#573c08',