diff --git a/less/chats.less b/less/chats.less
index af66610..af639c0 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -457,6 +457,11 @@
 				.user-select(none);
 			}
 
+			.chat-ip, .chat-edited {
+				margin-left: 5px;
+				margin-top: 2px;
+			}
+
 			.message-body {
 				margin-left: 45px;
 				overflow-y: hidden;
diff --git a/templates/partials/chats/message.tpl b/templates/partials/chats/message.tpl
index 8545f94..d7b9973 100644
--- a/templates/partials/chats/message.tpl
+++ b/templates/partials/chats/message.tpl
@@ -16,12 +16,10 @@
 		<!-- END -->
 		<span class="chat-timestamp timeago" title="{messages.timestampISO}"></span>
 		<!-- IF isAdminOrGlobalMod -->
-		<small class="chat-ip pull-right" title="[[modules:chat.show-ip]]"><i class="fa fa-info-circle chat-ip-button"></i></small>
+		<div class="chat-ip pull-right" title="[[modules:chat.show-ip]]"><i class="fa fa-info-circle chat-ip-button"></i></div>
 		<!-- ENDIF isAdminOrGlobalMod -->
-	</div>
-	<div component="chat/message/body" class="message-body">
 		<!-- IF messages.edited -->
-		<small class="text-muted pull-right" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></small>
+		<div class="text-muted pull-right" title="[[global:edited]] {messages.editedISO}"><i class="fa fa-edit"></i></span></div>
 		<!-- ENDIF messages.edited -->
 		<!-- IF !config.disableChatMessageEditing -->
 		<!-- IF messages.self -->
@@ -32,6 +30,8 @@
 		</div>
 		<!-- ENDIF messages.self -->
 		<!-- ENDIF !config.disableChatMessageEditing -->
+	</div>
+	<div component="chat/message/body" class="message-body">
 		{messages.content}
 	</div>
 </li>
\ No newline at end of file