diff --git a/client/css/style.css b/client/css/style.css
index 3be8fbb4..e0450af5 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -180,7 +180,7 @@ kbd {
 }
 
 .container {
-	margin: 20px auto;
+	margin-bottom: 20px;
 	max-width: 480px;
 	touch-action: pan-y;
 }
@@ -877,7 +877,6 @@ kbd {
 }
 
 #windows .header {
-	border-bottom: 1px solid #e7e7e7;
 	line-height: 48px;
 	height: 48px;
 	padding: 0 6px;
@@ -886,6 +885,10 @@ kbd {
 	overflow: hidden;
 }
 
+#windows #chat .header {
+	border-bottom: 1px solid #e7e7e7;
+}
+
 #windows .header .title {
 	font-size: 15px;
 	padding-left: 6px;
@@ -2207,10 +2210,6 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 		opacity: 0;
 	}
 
-	.container {
-		margin-top: 60px !important;
-	}
-
 	#sidebar button,
 	#sidebar .chan,
 	#sidebar .empty,
@@ -2312,7 +2311,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 
 @media (max-width: 479px) {
 	.container {
-		margin: 10px 0 !important;
+		margin: 0;
 	}
 
 	#sign-in .btn {
diff --git a/client/themes/morning.css b/client/themes/morning.css
index c02ca6a3..0f632250 100644
--- a/client/themes/morning.css
+++ b/client/themes/morning.css
@@ -32,7 +32,7 @@ body {
 
 /* Borders */
 #chat .content,
-#windows .header,
+#windows #chat .header,
 #chat .user-mode::before,
 #chat .userlist {
 	border-color: #2a323d;