diff --git a/client/css/style.css b/client/css/style.css
index 864451f7..314460e2 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -613,7 +613,6 @@ p {
 	line-height: 1;
 	height: 36px;
 	width: 36px;
-	margin-top: 6px;
 	flex-shrink: 0;
 }
 
@@ -1061,6 +1060,7 @@ textarea.input {
 }
 
 .header {
+	align-items: center;
 	line-height: 45px;
 	height: 45px;
 	padding: 0 6px;
@@ -2913,8 +2913,6 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 
 /* Correctly handle multiple successive whitespace characters.
    For example: user has quit ( ===> L   O   L <=== )  */
-
-.header .topic,
 #chat .msg[data-type="action"] .content,
 #chat .msg[data-type="message"] .content,
 #chat .msg[data-type="monospace_block"] .content,
@@ -2922,11 +2920,15 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 #chat .ctcp-message,
 #chat .part-reason,
 #chat .quit-reason,
-#chat .new-topic,
-#chat table.channel-list .topic {
+#chat .new-topic {
 	white-space: pre-wrap;
 }
 
+#chat table.channel-list .topic,
+.header .topic {
+	white-space: nowrap;
+}
+
 .chat-view[data-type="search-results"] .search-status {
 	display: flex;
 	height: 100%;