diff --git a/less/chats.less b/less/chats.less
index c44b592..eb8d03f 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -144,7 +144,7 @@
 
 		[component="chat/message/remaining"] {
 			position: absolute;
-			right: 5.25em;
+			right: 10em;
 			z-index: 2;
 			bottom: 0;
 			color: @gray-light;
diff --git a/templates/partials/chats/message-window.tpl b/templates/partials/chats/message-window.tpl
index 84f5da5..14de8cb 100644
--- a/templates/partials/chats/message-window.tpl
+++ b/templates/partials/chats/message-window.tpl
@@ -18,6 +18,7 @@
 	</ul>
 	<div component="chat/composer">
 		<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input mousetrap" rows="2"></textarea>
+		<button component="chat/upload/button" class="btn btn-light" type="button"><i class="fa fa-fw fa-2x fa-upload"></i></button>
 		<button class="btn btn-primary" type="button" data-action="send"><i class="fa fa-fw fa-2x fa-paper-plane"></i></button>
 		<span component="chat/message/remaining">{maximumChatMessageLength}</span>
 		<form component="chat/upload" method="post" enctype="multipart/form-data">