diff --git a/files/assets/css/chat.css b/files/assets/css/chat.css
index 8dc48ca97..3af7a1c90 100644
--- a/files/assets/css/chat.css
+++ b/files/assets/css/chat.css
@@ -88,10 +88,10 @@ p {
 .quote, .del {
 	padding: 0 0.5rem !important;
 	border: none !important;
-	float: right;
 	color: var(--black);
 	font-size: 12px;
-	margin-top: 4px;
+	margin-top: auto;
+    margin-bottom: auto;
 }
 
 lite-youtube {
diff --git a/files/templates/chat.html b/files/templates/chat.html
index f49bd9b2f..ee8c81c90 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -29,7 +29,7 @@
 				{% set mentioned = m and vlink in m['text_html'] or (quote_exists and messages[m['quotes']]['user_id'] == v.id) %}
 				<div class="chat-line {% if mentioned %}chat-mention{% endif %}" {% if m %}id="{{id}}"{% endif %}>
 					<div class="d-flex align-items-center">
-						<div class="text-muted chat-line-content">
+						<div class="text-muted chat-line-content d-flex">
 							<div class="{% if not (m and m['quotes']) %}d-none{% endif %} quotes" style="font-size:12px">
 								<a class="QuotedMessageLink" {% if m and m['quotes'] %}href="#{{m['quotes']}}"{% endif %}>
 									<i class="fas fa-reply"></i> 
@@ -56,11 +56,11 @@
 								{% endif %}
 							</span>
 							<span class="text d-none">{% if m %}{{m['text']}}{% endif %}</span>
+							<i class="quote btn fas fa-reply ml-auto" data-nonce="{{g.nonce}}" data-onclick="quote(this)"></i>
 							{% if v.admin_level > 1 %}
 								<i class="btn del fas fa-trash-alt"></i>
 								<i class="btn d-none del delmsg fas fa-trash-alt text-danger" data-nonce="{{g.nonce}}" data-onclick="del(this)"></i>
 							{% endif %}
-							<i class="quote btn fas fa-reply" data-nonce="{{g.nonce}}" data-onclick="quote(this)"></i>
 						</div>
 					</div>
 				</div>