diff --git a/client/css/style.css b/client/css/style.css
index 0b8b0b3c..c7ecc1d9 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1161,7 +1161,6 @@ button,
 	font: 12px Consolas, Menlo, Monaco, "Lucida Console", "DejaVu Sans Mono", "Courier New", monospace;
 	left: 0;
 	height: 34px;
-	margin-right: 64px;
 	position: relative;
 }
 
@@ -1188,24 +1187,30 @@ button,
 	border-radius: 2px;
 	height: 100%;
 	outline: none;
-	padding: 0 10px;
+	padding: 0 34px 0 10px;
 	-webkit-appearance: none;
 	width: 100%;
 }
 
 #form #submit {
-	background: #f4f4f4;
-	background-image: linear-gradient(#f4f4f4, #ececec);
-	border: 1px solid #d7d7d7;
-	border-bottom-color: #b7b7b7;
-	border-radius: 2px;
-	font: 12px Lato, sans-serif;
-	color: #555;
+	color: #9ca5b4;
 	height: 34px;
+	line-height: 34px;
 	position: absolute;
 	right: 0;
 	transition: opacity .3s;
-	width: 58px;
+	width: 34px;
+}
+
+#form #submit:before {
+	font: 14px FontAwesome;
+	content: "\f1d8";
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+#form #submit:hover {
+	opacity: .6;
 }
 
 #context-menu-container {
diff --git a/client/index.html b/client/index.html
index 066ba553..454230e4 100644
--- a/client/index.html
+++ b/client/index.html
@@ -312,11 +312,9 @@
 			</div>
 			<form id="form" method="post" action="">
 				<div class="inner">
-					<button id="submit" type="submit">
-						Send
-					</button>
 					<div class="input">
 						<label for="input" id="nick"></label>
+						<button id="submit" type="submit" title="Send"></button>
 						<input id="input" class="mousetrap">
 					</div>
 				</div>