diff --git a/less/chats.less b/less/chats.less
index 11ba24d..b874f3d 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -59,6 +59,10 @@
 				font-size: 1rem;
 			}
 		}
+
+		.close {
+			padding: 0.5em;
+		}
 	}
 
 	ul.well {
@@ -115,8 +119,4 @@
 	textarea {
 		resize: none;
 	}
-
-	[data-action="maximize"] {
-		margin: 0.4em;
-	}
 }
\ No newline at end of file
diff --git a/templates/chat.tpl b/templates/chat.tpl
index 98ca877..25ee726 100644
--- a/templates/chat.tpl
+++ b/templates/chat.tpl
@@ -3,7 +3,8 @@
 	<div class="modal-dialog">
 		<div class="modal-content">
 			<div class="modal-header">
-				<button type="button" class="close hidden-xs" data-action="maximize"><span aria-hidden="true"><i class="fa fa-expand"></i></span><span class="sr-only">[[modules:chat.maximize]]</span></button>
+				<button id="chat-close-btn" type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+				<button type="button" class="close" data-action="maximize"><span aria-hidden="true"><i class="fa fa-expand"></i></span><span class="sr-only">[[modules:chat.maximize]]</span></button>
 				<h4>[[modules:chat.chatting_with]] <i component="user/status" class="fa fa-circle status offline" title="[[global:offline]]"></i></h4>
 			</div>
 			<div class="modal-body">
@@ -19,7 +20,6 @@
 					<textarea component="chat/input" id="chat-message-input" rows="1" placeholder="[[modules:chat.placeholder]]" name="chat-message" class="form-control"></textarea>
 					<span class="input-group-btn">
 						<button id="chat-message-send-btn" class="btn btn-primary" href="#" type="button">[[modules:chat.send]]</button>
-						<button id="chat-close-btn" class="btn btn-warning" data-dismiss="modal" aria-hidden="true">[[global:close]]</button>
 					</span>
 				</div>
 			</div>