diff --git a/client/css/style.css b/client/css/style.css
index 9ae5169b..1ce32585 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -858,9 +858,11 @@ background on hover (unless active) */
 	margin: 2px 0;
 	margin-bottom: 10px;
 	outline: 0;
-	padding: 8px 10px;
+	padding: 0 10px;
 	transition: border-color 0.2s;
 	width: 100%;
+	height: 35px;
+	line-height: 35px;
 }
 
 .input:disabled {
@@ -872,12 +874,11 @@ background on hover (unless active) */
 	border-color: #79838c;
 }
 
-#windows select.input {
-	height: 35px;
-}
-
 #user-specified-css-input {
 	resize: vertical;
+	height: 10em;
+	padding: 6px 10px;
+	line-height: 1.5;
 }
 
 #windows .window {
@@ -1022,7 +1023,7 @@ background on hover (unless active) */
 	visibility: hidden;
 }
 
-#windows #form .input,
+#windows #form,
 .messages .msg,
 .userlist {
 	font-size: 14px;
@@ -1745,8 +1746,8 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 	font: normal normal normal 14px/1 FontAwesome;
 	font-size: 16px;
 	color: #607992;
-	width: 37px;
-	height: 37px;
+	width: 35px;
+	height: 35px;
 	display: flex;
 	justify-content: center;
 	align-items: center;
@@ -1895,9 +1896,6 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 
 #form {
 	flex: 0 0 auto;
-}
-
-#windows #form .input {
 	border: 0;
 	border-top: 1px solid #e7e7e7;
 	border-radius: 0;
diff --git a/client/index.html.tpl b/client/index.html.tpl
index 24f8b1f6..ebfa1ecb 100644
--- a/client/index.html.tpl
+++ b/client/index.html.tpl
@@ -85,13 +85,11 @@
 					<div id="chat"></div>
 					<div id="connection-error"></div>
 					<form id="form" method="post" action="">
-						<div class="input">
-							<span id="nick"></span>
-							<textarea id="input" class="mousetrap"></textarea>
-							<span id="submit-tooltip" class="tooltipped tooltipped-w tooltipped-no-touch" aria-label="Send message">
-								<button id="submit" type="submit" aria-label="Send message"></button>
-							</span>
-						</div>
+						<span id="nick"></span>
+						<textarea id="input" class="mousetrap"></textarea>
+						<span id="submit-tooltip" class="tooltipped tooltipped-w tooltipped-no-touch" aria-label="Send message">
+							<button id="submit" type="submit" aria-label="Send message"></button>
+						</span>
 					</form>
 				</div>
 				<div id="sign-in" class="window" role="tabpanel" aria-label="Sign-in"></div>
diff --git a/client/themes/morning.css b/client/themes/morning.css
index 43ce78ba..e9c16d59 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -81,7 +81,7 @@
 .irc-fg12 { color: #50a8ff; }
 
 /* Message form */
-#windows #form .input {
+#form {
 	background-color: #28333d;
 	border-color: #28333d;
 	color: var(--body-color);